ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/desktop-improvements into lp:ubuntu-keyboard

desktop-improvements
Merge into trunk

Proposed by Michael Sheldon on 2017-03-15

Status:	Merged
Approved by:	Bill Filler on 2017-03-20
Approved revision:	545
Merged at revision:	544
Proposed branch:	lp:~michael-sheldon/ubuntu-keyboard/desktop-improvements
Merge into:	lp:ubuntu-keyboard
Diff against target:	136 lines (+25/-14) 5 files modified qml/keys/CharKey.qml (+2/-2) qml/keys/ExtendedKeysSelector.qml (+15/-2) qml/keys/Magnifier.qml (+4/-2) qml/keys/SpaceKey.qml (+2/-2) qml/keys/key_constants.js (+2/-6)
To merge this branch:	bzr merge lp:~michael-sheldon/ubuntu-keyboard/desktop-improvements
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2017-03-15
Ubuntu Phablet Team		2017-03-15	Pending
Review via email: mp+319932@code.launchpad.net

Commit message

Tweak sizes for desktop use

Description of the change

Tweak sizes for desktop use

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2017-03-15:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/3/rebuild

review: Approve (continuous-integration)

lp:~michael-sheldon/ubuntu-keyboard/desktop-improvements updated on 2017-03-17

544. By Michael Sheldon on 2017-03-17: Fix scaling on magnifier and extended keys
545. By Michael Sheldon on 2017-03-17: Fix magnifier centering

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Bill Filler

IRIE Shinsuke

Michael Sheldon

Thomas Moenicke

kokoye2007 

     // be used, depending on the state. If no extended/extendedShifted arrays exist, no annotation is shown
     property string annotation: ""
-    /*! indicates if te key is currently pressed/down*/
+    /*! indicates if the key is currently pressed/down*/
     property alias currentlyPressed: keyMouseArea.pressed
     /* internal */
                 anchors.topMargin: units.gu(UI.annotationTopMargin)
                 anchors.rightMargin: units.gu(UI.annotationRightMargin)
                 font.family: UI.annotationFont
-                font.pixelSize: fullScreenItem.tablet ? units.dp(UI.tabletAnnotationFontSize) : units.dp(UI.phoneAnnotationFontSize)
+                font.pixelSize: fontSize / 3
                 font.weight: Font.Light
                 color: UI.annotationFontColor
             }
     property alias keys: rowOfKeys.children
     property alias rowX: rowOfKeys.x
     property alias rowY: rowOfKeys.y
+    property int fontSize: 0
     property int __width: 0
     property string __commitStr: ""
             reorderedModel.shift();
             keyRepeater.model = reorderedModel;
         } else {
-            keyRepeater.model = extendedKeysModel
+            keyRepeater.model = extendedKeysModel;
+        }
+        var longestKey = 1;
+        // Calculate font size based on longest key
+        if (extendedKeysModel != null) {
+            for(var i = 0; i < extendedKeysModel.length; i++) {
+                if (extendedKeysModel[i].length > longestKey) {
+                    longestKey = extendedKeysModel[i].length;
+                }
+            }
+            fontSize = (fullScreenItem.landscape ? (panel.keyHeight / 2) : (panel.keyHeight / 2.8))
+                       * (4 / (longestKey >= 2 ? (longestKey <= 6 ? longestKey + 2.5 : 8) : 4));
         }
     }
                     anchors.centerIn: parent;
                     text: modelData
                     font.family: UI.fontFamily
-                    font.pixelSize: text.length > 2 ? units.gu( UI.smallFontSize ) : units.gu( UI.fontSize )
+                    font.pixelSize: fontSize
                     font.weight: Font.Light
                     color: key.highlight ? UI.selectionColor : UI.fontColor
                     Component.onCompleted: __width += (textCell.width + units.gu( UI.popoverCellPadding));
         height: parent.height
         anchors.centerIn: anchorItem
-        anchors.verticalCenterOffset: -units.dp(UI.popoverTopMargin)
         // this property is used to synchronize scale and opacity animation
         property real animationStep: 0
         Text {
             id: label
             anchors.centerIn: parent
+            height: parent.height
             text: currentlyAssignedKey ? currentlyAssignedKey.valueToSubmit : ""
             font.family: UI.fontFamily
             font.weight: Font.Light
-            font.pixelSize: units.gu( UI.fontSizeMagnified )
+            font.pixelSize: panel.keyHeight * 0.6
+            verticalAlignment: Text.AlignVCenter
             color: UI.fontColor
         }
     Label {
         anchors.centerIn: parent
         anchors.verticalCenterOffset: -parent.rowMargin / 2 - units.gu(0.15)
-        font.family: UI.spaceFontFamily
+        font.family: UI.fontFamily
         font.weight: Font.Light
-        fontSize: fullScreenItem.tablet ? UI.tabletSpaceFontSize : UI.phoneSpaceFontSize
+        font.pixelSize: parent.fontSize * 0.6
         opacity: UI.spaceOpacity
         text: Languages.languageIdToName(maliit_input_method.activeLanguage)
         horizontalAlignment: Text.AlignHCenter
 var tabletKeyMargins  =   0.5;    // gu
 var phoneKeyMargins = 0.25 // gu
 var fontSize    =   2.5;    // gu
-var fontSizeMagnified   =   4; // gu
 var fontFamily  =   "Ubuntu";
 var fontColor   =   "#333333";
 var fontBold    =   false;
 var annotationFontColor = "#333333";
 var annotationFont = "Ubuntu";
-var spaceFontFamily = "Ubuntu";
-var tabletSpaceFontSize = "large";
-var phoneSpaceFontSize = "small";
 var spaceOpacity = 0.33;
 /* magnifier */
 var phoneKeyboardHeightPortrait = 0.40; // percent of screen
 var phoneKeyboardHeightLandscape = 0.49; // percent of screen
-var tabletKeyboardHeightPortrait = 0.39; // percent of screen
+var tabletKeyboardHeightPortrait = 0.31; // percent of screen
-var tabletKeyboardHeightLandscape = 0.42; // percent of screen
+var tabletKeyboardHeightLandscape = 0.34; // percent of screen