themes: Do expander arrow :hover properly

We want to prelight the arrow even when the label is hovered.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index eaeb54cc4ecedde46b319a16c2c6f0f1e9ee8e95..05037eb227bc67bec88b7e1816c4ac4c91584ffa 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3619,10 +3619,11 @@ expander {
 
     &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
 
-    &:hover { color: lighten($fg_color,30%); } //only lightens the arrow
-
     &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
   }
+  title:hover arrow {
+    color: lighten($fg_color,30%); //only lightens the arrow
+  }
 }
 
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c5abe78ed4d12be26b28a05e3a2dc7f94a8d6d86..bb2535128eab86953e500c6e6128c54a5eaba1e1 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1142,15 +1142,15 @@ menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, me
 
 check { border-radius: 3px; }
 
-check:checked { -gtk-icon-source: -gtk-recolor(url("assets/check-symbolic.symbolic.png")); }
+check:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")), -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); }
 
-check:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/dash-symbolic.symbolic.png")); }
+check:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); }
 
 treeview.view radio:selected:focus, treeview.view radio:selected, radio { border-radius: 100%; }
 
-treeview.view radio:checked:selected, radio:checked { -gtk-icon-source: -gtk-recolor(url("assets/bullet-symbolic.symbolic.png")); }
+treeview.view radio:checked:selected, radio:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-symbolic.symbolic.png")), -gtk-recolor(url("assets/bullet@2-symbolic.symbolic.png"))); }
 
-treeview.view radio:indeterminate:selected, radio:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/dash-symbolic.symbolic.png")); }
+treeview.view radio:indeterminate:selected, radio:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); }
 
 radio:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: scale(0); }
 
@@ -1568,10 +1568,10 @@ expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icont
 
 expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
 
-expander arrow:hover { color: white; }
-
 expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
+expander title:hover arrow { color: white; }
+
 /************ Calendar * */
 calendar { color: white; border: 1px solid #1b1f20; }
 

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c126927366ea31106c6454a7579184e6790f5e63..b5fa650f542e802539d120a40288de278e3b9992 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1162,15 +1162,15 @@ menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, me
 
 check { border-radius: 3px; }
 
-check:checked { -gtk-icon-source: -gtk-recolor(url("assets/check-symbolic.symbolic.png")); }
+check:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")), -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); }
 
-check:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/dash-symbolic.symbolic.png")); }
+check:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); }
 
 treeview.view radio:selected:focus, treeview.view radio:selected, radio { border-radius: 100%; }
 
-treeview.view radio:checked:selected, radio:checked { -gtk-icon-source: -gtk-recolor(url("assets/bullet-symbolic.symbolic.png")); }
+treeview.view radio:checked:selected, radio:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-symbolic.symbolic.png")), -gtk-recolor(url("assets/bullet@2-symbolic.symbolic.png"))); }
 
-treeview.view radio:indeterminate:selected, radio:indeterminate { -gtk-icon-source: -gtk-recolor(url("assets/dash-symbolic.symbolic.png")); }
+treeview.view radio:indeterminate:selected, radio:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); }
 
 radio:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: scale(0); }
 
@@ -1588,10 +1588,10 @@ expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icont
 
 expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
 
-expander arrow:hover { color: #748489; }
-
 expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
+expander title:hover arrow { color: #748489; }
+
 /************ Calendar * */
 calendar { color: black; border: 1px solid #b6b6b3; }
 

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 249cc426364b2df8f49895bd5b248a331895c864..c172362ce600c5c7aa45530207017c24acaa6a62 100644 (file)
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -2776,9 +2776,11 @@ expander {
     min-height: 16px;
     -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
     &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
-    &:hover { color: lighten($fg_color,30%); } //only lightens the arrow
     &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
   }
+  title:hover arrow {
+    color: lighten($fg_color,30%); //only lightens the arrow
+  }
 }
 
 /************

diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index c9ee7c888c303a66dc3dd0039ebe1a26fbde4cea..86d36c419ebf9e2f39ec96e5026399ef6ac6ba9e 100644 (file)
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -1238,10 +1238,10 @@ expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icont
 
 expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
 
-expander arrow:hover { color: white; }
-
 expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
+expander title:hover arrow { color: white; }
+
 /************ Calendar * */
 calendar { border: 1px solid gray; }
 

diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 24a1f0885bfbe4583c552af0ee05c7648129e4db..bc8532a4210318954ad00c8cd85f799b9a87865d 100644 (file)
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -1244,10 +1244,10 @@ expander arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icont
 
 expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
 
-expander arrow:hover { color: #4d4d4d; }
-
 expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
+expander title:hover arrow { color: #4d4d4d; }
+
 /************ Calendar * */
 calendar { border: 1px solid gray; }