AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

shortcuts: Redo the stack switcher theming

Browse Source 
Use style classes on the button instead of the stack switcher,
this makes it easier to reuse elsewhere.
This commit is contained in:
Matthias Clasen 2015-10-28 10:14:54 -04:00
parent 62ec4a2415
commit 20e46ce8ae
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkshortcutssection.c
View File

@ -354,7 +354,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
"spacing", 12,
"no-show-all", TRUE,
NULL);
gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self->switcher)), "round");
gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self->switcher)), GTK_STYLE_CLASS_LINKED);
self->show_all = gtk_button_new_with_mnemonic (_("_Show All"));
@ -501,6 +501,7 @@ adjust_page_buttons (GtkWidget *widget,
* much font size specific.
*/
gtk_widget_set_size_request (widget, 34, 34);
gtk_style_context_add_class (gtk_widget_get_style_context (widget), "circular");
label = gtk_bin_get_child (GTK_BIN (widget));
gtk_label_set_use_underline (GTK_LABEL (label), TRUE);

4
gtk/theme/Adwaita/_common.scss
View File

@ -3438,12 +3438,12 @@ decoration {
}
}
shortcutswindow .round .button {
.button.circular {
border-radius: 20px;
outline-radius: 20px;
}
shortcutswindow .round .button label {
.button.circular label {
padding: 0;
}

10
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -4649,15 +4649,13 @@ decoration {
background-origin: content-box;
background-position: right center; }
shortcutswindow .round .button, shortcutswindow .round .header-bar .button.titlebutton, .header-bar shortcutswindow .round .button.titlebutton,
shortcutswindow .round .titlebar .button.titlebutton,
.titlebar shortcutswindow .round .button.titlebutton {
.button.circular, .header-bar .circular.button.titlebutton,
.titlebar .circular.button.titlebutton {
border-radius: 20px;
outline-radius: 20px; }
shortcutswindow .round .button label, shortcutswindow .round .header-bar .button.titlebutton label, .header-bar shortcutswindow .round .button.titlebutton label,
shortcutswindow .round .titlebar .button.titlebutton label,
.titlebar shortcutswindow .round .button.titlebutton label {
.button.circular label, .header-bar .circular.button.titlebutton label,
.titlebar .circular.button.titlebutton label {
padding: 0; }
.frame.keycap {

10
gtk/theme/Adwaita/gtk-contained.css
View File

@ -4822,15 +4822,13 @@ decoration {
background-origin: content-box;
background-position: right center; }
shortcutswindow .round .button, shortcutswindow .round .header-bar .button.titlebutton, .header-bar shortcutswindow .round .button.titlebutton,
shortcutswindow .round .titlebar .button.titlebutton,
.titlebar shortcutswindow .round .button.titlebutton {
.button.circular, .header-bar .circular.button.titlebutton,
.titlebar .circular.button.titlebutton {
border-radius: 20px;
outline-radius: 20px; }
shortcutswindow .round .button label, shortcutswindow .round .header-bar .button.titlebutton label, .header-bar shortcutswindow .round .button.titlebutton label,
shortcutswindow .round .titlebar .button.titlebutton label,
.titlebar shortcutswindow .round .button.titlebutton label {
.button.circular label, .header-bar .circular.button.titlebutton label,
.titlebar .circular.button.titlebutton label {
padding: 0; }
.frame.keycap {