AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 16:30:15 +00:00
Code Issues Projects Releases Wiki Activity

window: Name the decoration style

Browse Source
This commit is contained in:
Benjamin Otte 2015-09-07 21:42:25 +02:00
parent 408920d438
commit 371f501632
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkwindow.c
View File

@ -6522,7 +6522,7 @@ subtract_borders (GtkBorder *one,
static void
style_context_save_to_decoration (GtkStyleContext *context)
{
gtk_style_context_save (context);
gtk_style_context_save_named (context, "decoration");
gtk_style_context_remove_class (context, GTK_STYLE_CLASS_BACKGROUND);
gtk_style_context_add_class (context, "window-frame");

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

@ -3031,7 +3031,7 @@ GtkInfoBar {
box-shadow: none; // otherwise it gets inherited by windowframe.csd
text-shadow: 0 1px black;
// FIXME: we need a border or tooltips vanish on black background.
&.window-frame.csd {
decoration.csd {
background-color: transparent;
}
}
@ -3220,7 +3220,7 @@ GtkVolumeButton.button {
* Window Decorations *
*********************/
.window-frame {
decoration {
border-radius: 7px 7px 0 0;
// lamefun trick to get rounded borders regardless of CSD use
border-width: 0px;
@ -3233,7 +3233,7 @@ GtkVolumeButton.button {
box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
0 0 0 1px $_wm_border; //doing borders with box-shadow
// FIXME rationalize window-frame shadows
// FIXME rationalize shadows
/* this is used for the resize cursor area */
margin: 10px;

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

@ -4070,7 +4070,7 @@ GtkInfoBar {
background-color: rgba(0, 0, 0, 0.8);
background-clip: padding-box;
border: 1px solid rgba(255, 255, 255, 0.1); }
.tooltip.window-frame.csd {
.tooltip decoration.csd {
background-color: transparent; }
.tooltip * {
@ -4207,30 +4207,30 @@ GtkColorSwatch {
/**********************
* Window Decorations *
*********************/
.window-frame {
decoration {
border-radius: 7px 7px 0 0;
border-width: 0px;
box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(28, 31, 31, 0.9);
/* this is used for the resize cursor area */
margin: 10px; }
.window-frame:backdrop {
decoration:backdrop {
box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9); }
.window-frame.tiled {
decoration.tiled {
border-radius: 0; }
.window-frame.popup {
decoration.popup {
box-shadow: none; }
.window-frame.ssd {
decoration.ssd {
box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); }
.window-frame.csd.popup {
decoration.csd.popup {
border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
.window-frame.csd.tooltip {
decoration.csd.tooltip {
border-radius: 5px;
box-shadow: none; }
.window-frame.csd.message-dialog {
decoration.csd.message-dialog {
border-radius: 7px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
.window-frame.solid-csd {
decoration.solid-csd {
border-radius: 0;
margin: 4px;
background-color: #393f3f;

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

@ -4242,7 +4242,7 @@ GtkInfoBar {
background-color: rgba(0, 0, 0, 0.8);
background-clip: padding-box;
border: 1px solid rgba(255, 255, 255, 0.1); }
.tooltip.window-frame.csd {
.tooltip decoration.csd {
background-color: transparent; }
.tooltip * {
@ -4379,30 +4379,30 @@ GtkColorSwatch {
/**********************
* Window Decorations *
*********************/
.window-frame {
decoration {
border-radius: 7px 7px 0 0;
border-width: 0px;
box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23);
/* this is used for the resize cursor area */
margin: 10px; }
.window-frame:backdrop {
decoration:backdrop {
box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); }
.window-frame.tiled {
decoration.tiled {
border-radius: 0; }
.window-frame.popup {
decoration.popup {
box-shadow: none; }
.window-frame.ssd {
decoration.ssd {
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
.window-frame.csd.popup {
decoration.csd.popup {
border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
.window-frame.csd.tooltip {
decoration.csd.tooltip {
border-radius: 5px;
box-shadow: none; }
.window-frame.csd.message-dialog {
decoration.csd.message-dialog {
border-radius: 7px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
.window-frame.solid-csd {
decoration.solid-csd {
border-radius: 0;
margin: 4px;
background-color: #ededed;

2
gtk/theme/HighContrast/_common.scss
View File

@ -2470,7 +2470,7 @@ GtkColorSwatch {
* Window Decorations *
*********************/
.window-frame {
decoration {
border-radius: 7px 7px 0 0;
// lamefun trick to get rounded borders regardless of CSD use
border-width: 0px;

12
gtk/theme/HighContrast/gtk.css
View File

@ -2660,23 +2660,23 @@ GtkColorSwatch {
/**********************
* Window Decorations *
*********************/
.window-frame {
decoration {
border-radius: 7px 7px 0 0;
border-width: 0px;
box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23);
/* this is used for the resize cursor area */
margin: 10px; }
.window-frame:backdrop {
decoration:backdrop {
box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); }
.window-frame.tiled {
decoration.tiled {
border-radius: 0; }
.window-frame.csd.popup {
decoration.csd.popup {
border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
.window-frame.csd.tooltip {
decoration.csd.tooltip {
border-radius: 5px;
box-shadow: none; }
.window-frame.solid-csd {
decoration.solid-csd {
border-radius: 0;
margin: 4px;
background-color: #fff;