From 386b9ef075e42b95797a61e9912615a0e02f5b35 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 13 Nov 2015 07:07:19 -0500 Subject: [PATCH] Adwaita: Fix styling of selected rows in treeviews This broke in some of the recent selection handling changes. --- gtk/theme/Adwaita/_common.scss | 5 ++++- gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++---- gtk/theme/Adwaita/gtk-contained.css | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 9ed98b1b71..e4f27c34df 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1275,7 +1275,10 @@ treeview.view { & rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props - &:selected { border-radius: 0; } // rest border radius in lists + &:selected { + border-radius: 0; + @extend %selected_items; + } &:selected, &:backdrop:selected { border-left-color: mix($selected_fg_color, $selected_bg_color, 50%); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 376607ff7e..05f5b4ed89 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -4453,20 +4453,20 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, .view selection:focus, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, -.menuitem.button.flat:selected, row:selected, .sidebar :selected { +.menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { background-color: #215d9c; color: #ffffff; } textview text selection:insensitive, .view selection:insensitive, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, - .menuitem.button.flat:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { + .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { color: #90aece; } textview text selection:backdrop, .view selection:backdrop, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, - .menuitem.button.flat:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { + .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:insensitive, .view selection:backdrop:insensitive, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, - .menuitem.button.flat:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { + .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { color: #648eba; } .monospace { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 489d65b70a..e640761b82 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -4625,21 +4625,21 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, .view selection:focus, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, -.menuitem.button.flat:selected, row:selected, .sidebar :selected { +.menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { background-color: #4a90d9; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } textview text selection:insensitive, .view selection:insensitive, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, - .menuitem.button.flat:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { + .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { color: #a5c8ec; } textview text selection:backdrop, .view selection:backdrop, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, - .menuitem.button.flat:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { + .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:insensitive, .view selection:backdrop:insensitive, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, - .menuitem.button.flat:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { + .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { color: #80b1e4; } .monospace {