Merge remote-tracking branch 'mntm/dev' into keyboard-typing

Next-Flip · Nov 10, 2024 · 7dd128f · 7dd128f
2 parents a093db3 + 79e187b
commit 7dd128f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/application/components/ChannelDelegate.qml b/application/components/ChannelDelegate.qml
@@ -31,8 +31,7 @@ ItemDelegate {
         }
 
         TextLabel {
-            text: control.text
-            font.capitalization: Font.Capitalize
+            text: control.text.replace(/^wip-/, '')
             color: control.down ? Theme.color.darkorange1 : control.hovered ? Theme.color.lightorange1 : Theme.color.lightorange2
             Layout.fillWidth: true
         }

diff --git a/application/styles/DefaultAmber/ComboBox.qml b/application/styles/DefaultAmber/ComboBox.qml
@@ -73,7 +73,7 @@ T.ComboBox {
 
     font.pixelSize: 32
     font.family: "HaxrCorp 4089"
-    font.capitalization: Font.Capitalize
+    font.capitalization: Font.AllUppercase
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             implicitContentWidth + leftPadding + rightPadding)
@@ -123,7 +123,7 @@ T.ComboBox {
         topPadding: 6 - control.padding
         bottomPadding: 6 - control.padding
 
-        text: control.displayText
+        text: control.displayText.replace(/^wip-/, '')
         font: control.font
 
         color: !control.enabled ? foregroundColor.disabled : control.down ? foregroundColor.down :