Support Compatibility display style

libpinyin · Jan 28, 2021 · 330ba5b · 330ba5b
1 parent 39c7da6
commit 330ba5b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/src/PYConfig.h b/src/PYConfig.h
@@ -35,7 +35,8 @@ namespace PY {
 
 typedef enum {
     DISPLAY_STYLE_TRADITIONAL,
-    DISPLAY_STYLE_COMPACT
+    DISPLAY_STYLE_COMPACT,
+    DISPLAY_STYLE_COMPATIBILITY
 } DisplayStyle;
 
 enum CloudInputSource{

diff --git a/src/PYPBopomofoEditor.cc b/src/PYPBopomofoEditor.cc
@@ -345,7 +345,8 @@ BopomofoEditor::commit (const gchar *str)
 void
 BopomofoEditor::updatePreeditText ()
 {
-    if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
+    if (DISPLAY_STYLE_COMPACT == m_config.displayStyle () ||
+        DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
         return;
 
     guint num = 0;
@@ -405,7 +406,8 @@ void
 BopomofoEditor::updateAuxiliaryText (void)
 {
     if (G_UNLIKELY (m_text.empty ())) {
-        if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle ())
+        if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle () ||
+            DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
             hideAuxiliaryText ();
         if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
             hidePreeditText ();
@@ -424,7 +426,8 @@ BopomofoEditor::updateAuxiliaryText (void)
     m_buffer << p;
 
     StaticText text (m_buffer);
-    if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle ())
+    if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle () ||
+        DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
         Editor::updateAuxiliaryText (text, TRUE);
     if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
         Editor::updatePreeditText (text, 0, TRUE);

diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc
@@ -193,7 +193,8 @@ static const struct{
     DisplayStyle display_style;
 } display_style_options [] = {
     {0, DISPLAY_STYLE_TRADITIONAL},
-    {1, DISPLAY_STYLE_COMPACT}
+    {1, DISPLAY_STYLE_COMPACT},
+    {2, DISPLAY_STYLE_COMPATIBILITY}
 };
 
 static const struct{

diff --git a/src/PYPDoublePinyinEditor.cc b/src/PYPDoublePinyinEditor.cc
@@ -124,7 +124,8 @@ void
 DoublePinyinEditor::updateAuxiliaryText (void)
 {
     if (G_UNLIKELY (m_text.empty ())) {
-        if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle ())
+        if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle () ||
+            DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
             hideAuxiliaryText ();
         if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
             hidePreeditText ();
@@ -143,7 +144,8 @@ DoublePinyinEditor::updateAuxiliaryText (void)
     m_buffer << p;
 
     StaticText text (m_buffer);
-    if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle ())
+    if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle () ||
+        DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
         Editor::updateAuxiliaryText (text, TRUE);
     if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
         Editor::updatePreeditText (text, 0, TRUE);

diff --git a/src/PYPFullPinyinEditor.cc b/src/PYPFullPinyinEditor.cc
@@ -91,7 +91,8 @@ void
 FullPinyinEditor::updateAuxiliaryText (void)
 {
     if (G_UNLIKELY (m_text.empty ())) {
-        if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle ())
+        if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle () ||
+            DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
             hideAuxiliaryText ();
         if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
             hidePreeditText ();
@@ -110,7 +111,8 @@ FullPinyinEditor::updateAuxiliaryText (void)
     m_buffer << p;
 
     StaticText text (m_buffer);
-    if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle ())
+    if (DISPLAY_STYLE_TRADITIONAL == m_config.displayStyle () ||
+        DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
         Editor::updateAuxiliaryText (text, TRUE);
     if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
         Editor::updatePreeditText (text, 0, TRUE);

diff --git a/src/PYPPinyinEditor.cc b/src/PYPPinyinEditor.cc
@@ -227,7 +227,8 @@ PinyinEditor::commit (const gchar *str)
 void
 PinyinEditor::updatePreeditText ()
 {
-    if (DISPLAY_STYLE_COMPACT == m_config.displayStyle ())
+    if (DISPLAY_STYLE_COMPACT == m_config.displayStyle () ||
+        DISPLAY_STYLE_COMPATIBILITY == m_config.displayStyle ())
         return;
 
     guint num = 0;