Commit 513ce22e authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Merge branch 'master' into 'master'

Make GTK3 window buttons consistent with those of GTK2

See merge request !18
parents a204cf3b cd30da59
......@@ -5416,7 +5416,7 @@ headerbar,
background-image: linear-gradient(to bottom,
@wm_bg_a,
@wm_bg_b);
border-radius: 6px 6px 0px 0px;
border-radius: 0px 0px 0px 0px;
border-width: 0 0 1px;
border-style: solid;
box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
......@@ -5522,7 +5522,7 @@ headerbar button.image-button,
}
.background.csd decoration {
border-radius: 6px 6px 0px 0px;
border-radius: 0px 0px 0px 0px;
border-width: 0px;
box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
/* this is used for the resize cursor area */
......
headerbar .right button.minimize.titlebutton,
headerbar .right:dir(rtl) button.minimize.titlebutton,
headerbar .left button.minimize.titlebutton,
......@@ -11,191 +10,43 @@ headerbar .right button.close.titlebutton,
headerbar .right:dir(rtl) button.close.titlebutton,
headerbar .left button.close.titlebutton,
headerbar .left:dir(rtl) button.close.titlebutton {
color: transparent;
background-position: center;
background-repeat: no-repeat;
background-size: 19px 19px;
}
/* Set correct layout with
gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <':minimize,maximize,close'>}" for
buttons on the right or
gsettings set org.gnome.settings-daemon.plugins.xsettings overrides "{'Gtk/DecorationLayout': <'close,maximize,minimize:'>}"
for buttons on the left */
/* minimize */
headerbar .right button.minimize.titlebutton:backdrop,
headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop,
headerbar .left button.minimize.titlebutton:backdrop,
headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop,
headerbar .right button.minimize.titlebutton,
headerbar .right:dir(rtl) button.minimize.titlebutton,
headerbar .left button.minimize.titlebutton,
headerbar .left:dir(rtl) button.minimize.titlebutton {
background-image: url('window-controls/minimize_focused_normal.png');
}
headerbar .right button.minimize.titlebutton:backdrop:hover,
headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
headerbar .left button.minimize.titlebutton:backdrop:hover,
headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover,
headerbar .right button.minimize.titlebutton:hover,
headerbar .right:dir(rtl) button.minimize.titlebutton:hover,
headerbar .left button.minimize.titlebutton:hover,
headerbar .left:dir(rtl) button.minimize.titlebutton:hover {
background-image: url('window-controls/minimize_focused_prelight.png');
}
headerbar .right button.minimize.titlebutton:active,
headerbar .right:dir(rtl) button.minimize.titlebutton:active,
headerbar .left button.minimize.titlebutton:active,
headerbar .left:dir(rtl) button.minimize.titlebutton:active,
headerbar .right button.minimize.titlebutton:checked,
headerbar .right:dir(rtl) button.minimize.titlebutton:checked,
headerbar .left button.minimize.titlebutton:checked,
headerbar .left:dir(rtl) button.minimize.titlebutton:checked {
background-image: url('window-controls/minimize_focused_pressed.png');
}
/*
headerbar .right button.minimize.titlebutton:backdrop,
headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop,
headerbar .left button.minimize.titlebutton:backdrop,
headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop {
background-image: url('window-controls/minimize_unfocused.png');
}
headerbar .right button.minimize.titlebutton:backdrop:hover,
headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
headerbar .left button.minimize.titlebutton:backdrop:hover,
headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover {
background-image: url('window-controls/minimize_unfocused_prelight.png');
}
*/
/* maximize */
headerbar .right button.maximize.titlebutton:backdrop,
headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop,
headerbar .left button.maximize.titlebutton:backdrop,
headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop,
headerbar .right button.maximize.titlebutton,
headerbar .right:dir(rtl) button.maximize.titlebutton,
headerbar .left button.maximize.titlebutton,
headerbar .left:dir(rtl) button.maximize.titlebutton {
background-image: url('window-controls/maximize_focused_normal.png');
}
headerbar .right button.maximize.titlebutton:backdrop:hover,
headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
headerbar .left button.maximize.titlebutton:backdrop:hover,
headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover,
headerbar .right button.maximize.titlebutton:hover,
headerbar .right:dir(rtl) button.maximize.titlebutton:hover,
headerbar .left button.maximize.titlebutton:hover,
headerbar .left:dir(rtl) button.maximize.titlebutton:hover {
background-image: url('window-controls/maximize_focused_prelight.png');
}
headerbar .right button.maximize.titlebutton:active,
headerbar .right:dir(rtl) button.maximize.titlebutton:active,
headerbar .left button.maximize.titlebutton:active,
headerbar .left:dir(rtl) button.maximize.titlebutton:active,
headerbar .right button.maximize.titlebutton:checked,
headerbar .right:dir(rtl) button.maximize.titlebutton:checked,
headerbar .left button.maximize.titlebutton:checked,
headerbar .left:dir(rtl) button.maximize.titlebutton:checked {
background-image: url('window-controls/maximize_focused_pressed.png');
/* Override default background gradient with transparency */
background-image: linear-gradient(to top, rgba(0,0,0,0) 0%, rgba(0,0,0,0) 50%)
}
/*
headerbar .right button.maximize.titlebutton:backdrop,
headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop,
headerbar .left button.maximize.titlebutton:backdrop,
headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop {
background-image: url('window-controls/maximize_unfocused.png');
}
headerbar .right button.maximize.titlebutton:backdrop:hover,
headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
headerbar .left button.maximize.titlebutton:backdrop:hover,
headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover {
background-image: url('window-controls/maximize_unfocused_prelight.png');
}
*/
/* close */
headerbar .right button.close.titlebutton:backdrop,
headerbar .right:dir(rtl) button.close.titlebutton:backdrop,
headerbar .left button.close.titlebutton:backdrop,
headerbar .left:dir(rtl) button.close.titlebutton:backdrop,
headerbar .right button.close.titlebutton,
headerbar .right:dir(rtl) button.close.titlebutton,
headerbar .left button.close.titlebutton,
headerbar .left:dir(rtl) button.close.titlebutton {
background-image: url('window-controls/close_focused_normal.png');
/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
}
headerbar .right button.close.titlebutton:backdrop:hover,
headerbar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
headerbar .left button.close.titlebutton:backdrop:hover,
headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover,
headerbar .right button.close.titlebutton:hover,
headerbar .right:dir(rtl) button.close.titlebutton:hover,
headerbar .left button.close.titlebutton:hover,
headerbar .left:dir(rtl) button.close.titlebutton:hover {
background-image: url('window-controls/close_focused_prelight.png');
}
headerbar .right button.close.titlebutton:active,
headerbar .right:dir(rtl) button.close.titlebutton:active,
headerbar .left button.close.titlebutton:active,
headerbar .left:dir(rtl) button.close.titlebutton:active,
headerbar .right button.close.titlebutton:checked,
headerbar .right:dir(rtl) button.close.titlebutton:checked,
headerbar .left button.close.titlebutton:checked,
headerbar .left:dir(rtl) button.close.titlebutton:checked {
background-image: url('window-controls/close_focused_pressed.png');
}
/*
headerbar .right button.close.titlebutton:backdrop,
headerbar .right:dir(rtl) button.close.titlebutton:backdrop,
headerbar .left button.close.titlebutton:backdrop,
headerbar .left:dir(rtl) button.close.titlebutton:backdrop {
background-image: url('window-controls/close_unfocused.png');
}
headerbar .right button.close.titlebutton:backdrop:hover,
headerbar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
headerbar .left button.close.titlebutton:backdrop:hover,
headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
background-image: url('window-controls/close_unfocused_prelight.png');
}
*/
.titlebar button.close.titlebutton {
/* fake request to avoid usage of regular window-close button*/
-gtk-icon-style: requested;
}
/* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */
/*
headerbar .button.popup.titlebutton {
background-image: url('window-controls/menu.png');
.titlebar button.close.titlebutton:hover,
.titlebar button.maximize.titlebutton:hover,
.titlebar button.minimize.titlebutton:hover {
-gtk-icon-effect: none;
}
headerbar .button.popup.titlebutton:hover {
background-image: url('window-controls/menu_prelight.png');
.titlebar button.close.titlebutton image,
.titlebar button.maximize.titlebutton image,
.titlebar button.minimize.titlebutton image {
opacity: 0.7;
}
headerbar .button.popup.titlebutton:active {
background-image: url('window-controls/menu.png');
.titlebar button.close.titlebutton:hover image,
.titlebar button.maximize.titlebutton:hover image,
.titlebar button.minimize.titlebutton:hover image {
opacity: 1.0;
}
.titlebar button.close.titlebutton:backdrop image,
.titlebar button.maximize.titlebutton:backdrop image,
.titlebar button.minimize.titlebutton:backdrop image {
/* FIXME: Backdrop doesn't seem to be working at all for GTK3 with this
* theme */
opacity: 0.3;
}
*/
/* gtk+-3.20 */
headerbar button.close.titlebutton,
headerbar button.minimize.titlebutton,
headerbar button.maximize.titlebutton {
......@@ -203,10 +54,3 @@ headerbar button.maximize.titlebutton {
border-image: none;
background-color: transparent;
}
headerbar button.close.titlebutton image,
headerbar button.minimize.titlebutton image,
headerbar button.maximize.titlebutton image {
color: transparent;
}
themedir = $(datadir)/themes/BlueMenta/gtk-3.0/window-controls
theme_DATA = \
close_focused_normal.png \
close_focused_prelight.png \
close_focused_pressed.png \
close_unfocused.png \
close_unfocused_prelight.png \
maximize_focused_normal.png \
maximize_focused_prelight.png \
maximize_focused_pressed.png \
maximize_unfocused.png \
maximize_unfocused_prelight.png \
menu.png \
menu_prelight.png \
minimize_focused_normal.png \
minimize_focused_prelight.png \
minimize_focused_pressed.png \
minimize_unfocused.png \
minimize_unfocused_prelight.png
EXTRA_DIST = $(theme_DATA)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment