Changeset 81265 in vbox

Timestamp:

Oct 14, 2019 5:16:48 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6143. Including the space after in the row definitions.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/softkeyboard/UISoftKeyboard.cpp (modified) (4 diffs)
• xml/101_ansi.xml (modified) (1 diff)
• xml/102_iso.xml (modified) (1 diff)
• xml/103_ansi.xml (modified) (1 diff)
• xml/103_iso.xml (modified) (1 diff)
• xml/106_japanese.xml (modified) (1 diff)
• xml/multimedia_keys.xml (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -696 +696 @@
     void  parseKey(UISoftKeyboardRow &row);
     void  parseRow(int iDefaultWidth, int iDefaultHeight, QVector<UISoftKeyboardRow> &rows);
-    /**  Parses the verticel space between the rows. */
-    void  parseRowSpace(QVector<UISoftKeyboardRow> &rows);
     /** Parses the horizontal space between keys. */
     void  parseKeySpace(UISoftKeyboardRow &row);
@@ -2962 +2960 @@
             ++iRowCount;
         }
-        else if (m_xmlReader.name() == "space")
-            parseRowSpace(rows);
         else if (m_xmlReader.name() == "name")
             physicalLayout.setName(m_xmlReader.readElementText());
@@ -2999 +2995 @@
             m_xmlReader.skipCurrentElement();
     }
-}
-
-void UIPhysicalLayoutReader::parseRowSpace(QVector<UISoftKeyboardRow> &rows)
-{
-    int iSpace = 0;
-    while (m_xmlReader.readNextStartElement())
-    {
-        if (m_xmlReader.name() == "height")
-            iSpace = m_xmlReader.readElementText().toInt();
-        else
-            m_xmlReader.skipCurrentElement();
-    }
-    if (!rows.empty())
-        rows.back().setSpaceHeightAfter(iSpace);
 }
 
@@ -3086 +3068 @@
 {
     int iWidth = row.defaultWidth();
+    int iHeight = 0;
     while (m_xmlReader.readNextStartElement())
     {
         if (m_xmlReader.name() == "width")
             iWidth = m_xmlReader.readElementText().toInt();
+        else if (m_xmlReader.name() == "height")
+            iHeight = m_xmlReader.readElementText().toInt();
         else
             m_xmlReader.skipCurrentElement();
     }
+    row.setSpaceHeightAfter(iHeight);
     /* If we have keys add the parsed space to the last key as the 'space after': */
     if (!row.keys().empty())

trunk/src/VBox/Frontends/VirtualBox/xml/101_ansi.xml

@@ -116 +116 @@
             <scancode>0x45</scancode>
         </key>
+        <space>
+            <height>20</height>
+        </space>
     </row>
-    <space>
-        <height>20</height>
-    </space>
     <row>
         <key>

trunk/src/VBox/Frontends/VirtualBox/xml/102_iso.xml

@@ -116 +116 @@
             <scancode>0x45</scancode>
         </key>
+        <space>
+            <height>20</height>
+        </space>
     </row>
-    <space>
-        <height>20</height>
-    </space>
     <row>
         <key>

trunk/src/VBox/Frontends/VirtualBox/xml/103_ansi.xml

@@ -114 +114 @@
             <scancode>0x45</scancode>
         </key>
+        <space>
+            <height>20</height>
+        </space>
     </row>
-    <space>
-        <height>20</height>
-    </space>
     <row>
         <key>

trunk/src/VBox/Frontends/VirtualBox/xml/103_iso.xml

@@ -116 +116 @@
             0xe1-0x1d-0x45-0xe1-0x9d-0xc5
         </key>
+        <space>
+            <height>20</height>
+        </space>
     </row>
-    <space>
-        <height>20</height>
-    </space>
     <row>
         <key>

trunk/src/VBox/Frontends/VirtualBox/xml/106_japanese.xml

@@ -116 +116 @@
             <scancode>0x45</scancode>
         </key>
+        <space>
+            <height>20</height>
+        </space>
     </row>
-    <space>
-        <height>20</height>
-    </space>
     <row>
         <key>

trunk/src/VBox/Frontends/VirtualBox/xml/multimedia_keys.xml

@@ -150 +150 @@
             <staticcaption>🔊</staticcaption>
         </key>
+        <space>
+            <height>20</height>
+        </space>
     </row>
 </physicallayout>