Fixed gnome-shell keyboard issues

vinceliuice · Aug 17, 2020 · b27605d · b27605d
1 parent e86e3b7
commit b27605d
Show file tree

Hide file tree

Showing 7 changed files with 664 additions and 1,012 deletions.
diff --git a/COPYING b/COPYING
diff --git a/LICENSE b/LICENSE
diff --git a/render-assets.sh b/render-assets.sh
@@ -38,7 +38,7 @@ render_thumbnail() {
 
     $INKSCAPE --export-id=thumbnail$2 \
               --export-id-only \
-              --export-type="png" $ASRC_DIR/$1/thumbnail.svg >/dev/null
+              --export-filename=$ASRC_DIR/$1/thumbnail$2.png $ASRC_DIR/$1/thumbnail.svg >/dev/null
     $OPTIPNG -o7 --quiet $ASRC_DIR/$1/thumbnail$2.png
   fi
 }

diff --git a/src/assets/gtk-3.0/common-assets/render-assets.sh b/src/assets/gtk-3.0/common-assets/render-assets.sh
@@ -7,53 +7,30 @@ SRC_FILE="assets.svg"
 ASSETS_DIR="assets"
 INDEX="assets.txt"
 
-# check command avalibility
-has_command() {
-  "$1" -v $1 > /dev/null 2>&1
-}
-
 mkdir -p $ASSETS_DIR
 
 for i in `cat $INDEX`
-do
+do 
 if [ -f $ASSETS_DIR/$i.png ]; then
     echo $ASSETS_DIR/$i.png exists.
 else
     echo
     echo Rendering $ASSETS_DIR/$i.png
-
-    if has_command dnf; then
-      $INKSCAPE --export-id=$i \
-                --export-id-only \
-                --export-type="png" $SRC_FILE >/dev/null
-    else
-      $INKSCAPE --export-id=$i \
-                --export-id-only \
-                --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-    fi
-
-    $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png
+    $INKSCAPE --export-id=$i \
+              --export-id-only \
+              --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
+    $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png 
 fi
-
 if [ -f $ASSETS_DIR/$i@2.png ]; then
     echo $ASSETS_DIR/$i@2.png exists.
 else
     echo
     echo Rendering $ASSETS_DIR/$i@2.png
-
-    if has_command dnf; then
-      $INKSCAPE --export-id=$i \
-                --export-dpi=180 \
-                --export-id-only \
-                --export-type="png" $SRC_FILE >/dev/null
-    else
-      $INKSCAPE --export-id=$i \
-                --export-dpi=180 \
-                --export-id-only \
-                --export-png=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null
-    fi
-
-    $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png
+    $INKSCAPE --export-id=$i \
+              --export-dpi=180 \
+              --export-id-only \
+              --export-filename=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null
+    $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png 
 fi
 done
 exit 0
diff --git a/src/assets/gtk-3.0/thumbnail-dark.png b/src/assets/gtk-3.0/thumbnail-dark.png
diff --git a/src/assets/gtk-3.0/thumbnail-light.png b/src/assets/gtk-3.0/thumbnail-light.png
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
@@ -2406,15 +2406,27 @@ StWidget.focused .app-well-app-running-dot {
 //Keyboard
 /* On-screen Keyboard */
 .word-suggestions {
-    font-size: 14pt;
-    spacing: 12px;
-    min-height: 20pt;
+  font-size: 14pt;
+  spacing: 12px;
+  min-height: 20pt;
 }
 
 #keyboard {
-    background-color: rgba(black, 0.25);
+  background-color: rgba(black, 0.25);
+  box-shadow: none;
+
+  .page-indicator {
+    padding: 6px;
+
+    .page-indicator-icon {
+      width: 8px;
+      height: 8px;
+    }
+  }
 }
 
+// the container for individual keys
+.key-container,
 .keyboard-layout {
   padding: 4px;
   spacing: 4px;
@@ -2454,25 +2466,27 @@ StWidget.focused .app-well-app-running-dot {
   }
   &.enter-key {
     background-color: $primary_color;
-    background-image: url("assets/key-enter.svg");
+    // background-image: url("assets/key-enter.svg");
     &:focus, &:hover { color: $light_alt_fg_color; background-color: lighten($primary_color, 5%); }
     &:checked, &:active { color: $light_alt_fg_color; background-color: darken($primary_color, 10%); }
   }
-  &.shift-key-lowercase {
-    background-image: url("assets/key-shift.svg");
-  }
-  &.shift-key-uppercase {
-    background-image: url("assets/key-shift-uppercase.svg");
-  }
-  &.shift-key-uppercase:latched {
-    background-image: url("assets/key-shift-latched-uppercase.svg");
-  }
-  &.hide-key {
-    background-image: url("assets/key-hide.svg");
-  }
-  &.layout-key {
-    background-image: url("assets/key-layout.svg");
-  }
+  // &.shift-key-lowercase {
+  //   background-image: url("assets/key-shift.svg");
+  // }
+  // &.shift-key-uppercase {
+  //   background-image: url("assets/key-shift-uppercase.svg");
+  // }
+  // &.shift-key-uppercase:latched {
+  //   background-image: url("assets/key-shift-latched-uppercase.svg");
+  // }
+  // &.hide-key {
+  //   background-image: url("assets/key-hide.svg");
+  // }
+  // &.layout-key {
+  //   background-image: url("assets/key-layout.svg");
+  // }
+
+  StIcon { icon-size: 1.125em; }
 }
 
 .keyboard-subkeys { //long press on a key popup