From 88d02754d11d174a7baf3db7beb857f28dac55ee Mon Sep 17 00:00:00 2001
From: Steve M <29017677+smurphos@users.noreply.github.com>
Date: Wed, 26 Dec 2018 11:25:58 +0000
Subject: [PATCH] Cinnamon Update (#178)
* Cinnamon4 Menu - Distinguish favorites scrollbox from systembox
* Cinnamon4 Overview - add support for overview place-holder
* Cinnamon4 Overview - add support for .window-caption:focus
* Cinnamon4 panel - add support for grouped-window-list
* Cinnamon3.8 panel - add support for window-list-preview
* Cinnamon3.6 panel - add support for window-list-item-box.progress
* Cinnamon panel - workspace switcher vertical panel fix
* Cinnamon panel - rework broken panel launchers
* Cinnamon4 - Amend grouped-window-list and panel-launcher highlighting scheme
* Cinnamon - Fix workspace-osd
* Cinnamon - Fix cinnamenu right-click context menu
* Cinnamon - Fix keyboard applet on vertical panels
* Cinnamon - Fix missing level-bar in osd-window
* Cinnamon - Overview - fix excessive spacing in window-caption
* Cinnamon - Expo name-entry - fix selection, add hover class, allow for font-scaling
* Cinnamon - Soundplayer - fix distorted open and quit player icons
* Cinnamon4 - grouped-window-list - revise thumbnail display and whitespace tidyup
* Cinnamon4 - grouped-window-list - tweak label highlighting and padding
* Cinnamon4 - grouped-window-list-thumbnail - add spacing again
---
.../panel/window-list-hover-bottom.svg | 162 ++++++++++++++
.../panel/window-list-hover-left.svg | 164 ++++++++++++++
.../panel/window-list-hover-right.svg | 164 ++++++++++++++
.../panel/window-list-hover-top.svg | 162 ++++++++++++++
common/cinnamon/sass/_common.scss | 211 ++++++++++++++----
5 files changed, 814 insertions(+), 49 deletions(-)
create mode 100644 common/cinnamon/common-assets/panel/window-list-hover-bottom.svg
create mode 100644 common/cinnamon/common-assets/panel/window-list-hover-left.svg
create mode 100644 common/cinnamon/common-assets/panel/window-list-hover-right.svg
create mode 100644 common/cinnamon/common-assets/panel/window-list-hover-top.svg
diff --git a/common/cinnamon/common-assets/panel/window-list-hover-bottom.svg b/common/cinnamon/common-assets/panel/window-list-hover-bottom.svg
new file mode 100644
index 0000000..b47481d
--- /dev/null
+++ b/common/cinnamon/common-assets/panel/window-list-hover-bottom.svg
@@ -0,0 +1,162 @@
+
+
+
+
diff --git a/common/cinnamon/common-assets/panel/window-list-hover-left.svg b/common/cinnamon/common-assets/panel/window-list-hover-left.svg
new file mode 100644
index 0000000..9e4a67f
--- /dev/null
+++ b/common/cinnamon/common-assets/panel/window-list-hover-left.svg
@@ -0,0 +1,164 @@
+
+
+
+
diff --git a/common/cinnamon/common-assets/panel/window-list-hover-right.svg b/common/cinnamon/common-assets/panel/window-list-hover-right.svg
new file mode 100644
index 0000000..608e198
--- /dev/null
+++ b/common/cinnamon/common-assets/panel/window-list-hover-right.svg
@@ -0,0 +1,164 @@
+
+
+
+
diff --git a/common/cinnamon/common-assets/panel/window-list-hover-top.svg b/common/cinnamon/common-assets/panel/window-list-hover-top.svg
new file mode 100644
index 0000000..5b9b762
--- /dev/null
+++ b/common/cinnamon/common-assets/panel/window-list-hover-top.svg
@@ -0,0 +1,162 @@
+
+
+
+
diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index 9cd4df9..bbffe58 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -438,7 +438,6 @@ StScrollBar {
-minimum-hpadding: 3px;
font-weight: bold;
color: white;
- height: 22px;
&:hover {}
}
@@ -468,38 +467,49 @@ StScrollBar {
background-color: $osd_bg_color;
border: 1px solid $osd_bg_color;
color: $osd_fg_color;
- spacing: 25px;
+ spacing: 4px;
border-radius: 2px;
font-size: 9pt;
padding: 5px 8px;
-cinnamon-caption-spacing: 4px;
- &#selected {
+ &#selected, &:focus {
background-color: $selected_bg_color;
color: $selected_fg_color;
border: 1px solid $selected_bg_color;
- spacing: 25px;
}
}
-.expo-workspaces-name-entry,
-.expo-workspaces-name-entry#selected {
- height: 15px;
+.overview-empty-placeholder {
+ text-align: center;
+ font-weight: bold;
+ spacing: 1em;
+ padding: 16px;
+ color: $_shell_fg_color;
+ border-image: url("common-assets/misc/osd.svg") 9 9 9 9;
+}
+
+.expo-workspaces-name-entry {
+ height: 1.5em;
border-radius: 2px;
font-size: 9pt;
padding: 5px 8px;
-cinnamon-caption-spacing: 4px;
+ transition-duration: 300;
@include entry(osd);
- &:focus {
+ &:focus, &#selected {
border: 1px solid $selected_bg_color;
background-color: $selected_bg_color;
color: $selected_fg_color;
font-style: italic;
- transition-duration: 300;
selection-background-color: $selected_fg_color;
selected-color: $selected_bg_color;
}
+
+ &:hover {
+ border: 1px solid $selected_bg_color;
+ }
}
.expo-workspace-thumbnail-frame {
@@ -1104,8 +1114,15 @@ StScrollBar {
transition-duration: 300;
background-color: $bg_color;
border: 1px solid $borders_color;
+ spacing: 1em;
}
-
+
+ &-favorites-scrollbox {
+ padding-bottom: 1em;
+ border-bottom: 1px solid;
+ border-color: $borders_color;
+ }
+
&-favorites-button {
padding: 10px;
border: 1px solid rgba(0,0,0,0);
@@ -1206,6 +1223,7 @@ StScrollBar {
/* Context menu (at the moment only for favorites) */
.menu-context-menu {
+ padding: 1em 0.6em;
}
//
@@ -1244,6 +1262,9 @@ StScrollBar {
border-radius: 2px;
color: $selected_bg_color;
}
+ .level-bar {
+ background-color: $selected_bg_color;
+ }
}
//
@@ -1257,6 +1278,10 @@ StScrollBar {
.panel-bottom & { padding-top: 1px; }
.panel-top & { padding-bottom: 1px; }
+
+ .progress {
+ background-color: transparentize($success_color, 0.8);
+ }
&.vertical {
spacing: 4px;
@@ -1266,6 +1291,16 @@ StScrollBar {
&:highlight { background-color: transparentize($error_color, 0.5); }
}
+ &-preview {
+ spacing: 8px;
+ color: $osd_fg_color;
+ background: none;
+ border: none;
+ border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
+ border-radius: 3px;
+ padding: 16px;
+ }
+
&-item-label {
font-weight: bold;
width: 15em;
@@ -1307,6 +1342,95 @@ StScrollBar {
}
}
+//
+// Grouped Window List (Cinnamon 4)
+//
+.grouped-window-list {
+ &-thumbnail-label {
+ padding-left: 3px;
+ }
+ &-number-label {
+ z-index: 99;
+ color: $_shell_fg_color;
+ }
+ /// May need to revise depending on upstream GWL developments
+ &-button-label {
+ padding: 3px;
+ }
+ &-badge {
+ border-radius: 256px;
+ background-color: $panel_bg;
+ }
+ &-thumbnail-alert {
+ background-color: $warning_color;
+ }
+ &-item-box {
+ transition-duration: 100;
+ font-weight: bold;
+ background-image: none;
+ color: transparentize($_shell_fg_color, 0.4);
+ &:hover, &:active:hover { color: $_shell_fg_color; }
+ &:hover, &:active, &:active:hover {
+
+ .panel-bottom & { border-image: url("common-assets/panel/window-list-hover-bottom.svg") 3 3 1 3; }
+ .panel-top & { border-image: url("common-assets/panel/window-list-hover-top.svg") 3 3 3 1; }
+ .panel-left & { border-image: url("common-assets/panel/window-list-hover-left.svg") 3 1 3 3; }
+ .panel-right & { border-image: url("common-assets/panel/window-list-hover-right.svg") 1 3 3 3; }
+ }
+ &:focus, &:focus:hover {
+ color: $_shell_fg_color;
+
+ .panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
+ .panel-top & { border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; }
+ .panel-left & { border-image: url("common-assets/panel/window-list-active-left.svg") 3 1 3 3; }
+ .panel-right & { border-image: url("common-assets/panel/window-list-active-right.svg") 1 3 3 3; }
+ }
+ .progress {
+ background-color: transparentize($success_color, 0.8);
+ }
+ }
+ &-item-demands-attention {
+ background-gradient-start: $warning_color;
+ background-gradient-end: $warning_color;
+ }
+ &-thumbnail-menu {
+ color: $osd_fg_color;
+ background: none;
+ border: none;
+ border-image: url("common-assets/misc/bg.svg") 9 9 9 9;
+ border-radius: 3px;
+ padding: 10px 20px;
+
+ .item-box {
+ margin: 8px;
+ spacing: 4px;
+ border-radius: 2px;
+ border: 1px solid none;
+ &:outlined {
+ border: 1px solid $selected_bg_color;
+ }
+ &:selected {
+ background-color: $selected_bg_color;
+ border: 1px solid $selected_bg_color;
+ color: $selected_fg_color;
+ }
+ }
+ .thumbnail-box {
+ padding: 2px;
+ spacing: 4px;
+ }
+ .thumbnail {
+ width: 256px;
+ }
+ .separator {
+ width: 1px;
+ background: $selected_bg_color;
+ }
+ }
+}
+.vertical .grouped-window-list-item-box {
+ padding: 2px 0;
+}
///
// Sound Applet (status/volume.js)
//
@@ -1375,7 +1499,7 @@ StScrollBar {
StButton:small {
width: 16px;
- height: 8px;
+ height: 16px;
padding: 1px;
StIcon { icon-size: 12px; }
@@ -1453,6 +1577,9 @@ StScrollBar {
&:outlined, &:outlined:hover { color: $selected_bg_color; }
&:hover { color: transparentize($selected_bg_color, 0.5) }
+ &.vertical {
+ height: 15px;
+ }
}
/* Controls the style when using the "Visual representation" option */
@@ -1489,43 +1616,28 @@ StScrollBar {
//
// Panel Launchers Applet (panelLaunchers.js)
//
-#panel-launchers-box {
- padding-left: 7px;
-
- &.vertical {
- padding: 2px 0;
+.panel-launchers {
+ padding: 0 4px;
+ .launcher {
+ padding: 0 4px;
+ transition-duration: 200;
+ background-image: none;
+ }
+ &.vertical {
+ padding: 4px 0;
+ .launcher {
+ padding: 4px 0;
+ }
+ }
+ .launcher:hover {
+
+ .panel-bottom & { border-image: url("common-assets/panel/window-list-hover-bottom.svg") 3 3 1 3; }
+ .panel-top & { border-image: url("common-assets/panel/window-list-hover-top.svg") 3 3 3 1; }
+ .panel-left & { border-image: url("common-assets/panel/window-list-hover-left.svg") 3 1 3 3; }
+ .panel-right & { border-image: url("common-assets/panel/window-list-hover-right.svg") 1 3 3 3; }
}
}
-.panel-launcher,
-.launcher {
- margin: 1px;
- padding: 1px;
- transition-duration: 200;
-
- &:hover {
- background-gradient-direction: none;
- border: 0px solid $selected_bg_color;
-
- .panel-bottom & { border-bottom-width: 1px; }
- .panel-top & { border-top-width: 1px; }
- .panel-left & { border-left-width: 1px; padding-left: 0; }
- .panel-right & { border-right-width: 1px; padding-right: 0; }
- }
-
- .panel-bottom & {
- margin-top: 0;
- margin-bottom: 0;
- }
-
- .panel-top & {
- margin-top: 0;
- margin-bottom: 0;
- padding-top: 0;
- }
-
-}
-
//
// Overview corner
//
@@ -1666,12 +1778,13 @@ StScrollBar {
//
// Workspace OSD
//
-/*FIXME*/
.workspace-osd {
- /*color: red;*/
- text-shadow: black 5px 5px 5px;
+ text-align: center;
font-weight: bold;
- font-size: 48pt;
+ spacing: 1em;
+ padding: 16px;
+ color: $_shell_fg_color;
+ border-image: url("common-assets/misc/osd.svg") 9 9 9 9;
}
//