elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-10-03 18:27:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

IconGroup: update background design

Browse Source
This commit is contained in:
Danielle Foré 2023-12-18 12:59:32 -08:00
parent fa8ebfd0be
commit d55720ed0c
2 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/gala.css
View File

@ -62,3 +62,18 @@
0 3px 14px 2px alpha(#000, 0.12),
0 5px 5px -3px alpha(#000, 0.4);
}
.workspace-switcher.decoration {
border-radius: 6px;
box-shadow:
0 3px 4px alpha(#000, 0.25),
0 3px 3px -3px alpha(#000, 0.45);
}
.workspace-switcher-dnd.decoration {
border-radius: 6px;
box-shadow:
0 8px 10px 1px alpha(#000, 0.14),
0 3px 14px 2px alpha(#000, 0.12),
0 5px 5px -3px alpha(#000, 0.4);
}

69
src/Widgets/IconGroup.vala
View File

@ -13,8 +13,8 @@ namespace Gala {
public class IconGroup : Clutter.Actor {
public const int SIZE = 64;
private const int PLUS_SIZE = 8;
private const int PLUS_WIDTH = 24;
private const int PLUS_SIZE = 6;
private const int PLUS_WIDTH = 26;
private const int BACKDROP_ABSOLUTE_OPACITY = 40;
/**
@ -208,6 +208,7 @@ namespace Gala {
* by relayouting in the same function, as it's only ever called when we invalidate it.
*/
private bool draw (Cairo.Context cr) {
clear_effects ();
cr.set_operator (Cairo.Operator.CLEAR);
cr.paint ();
cr.set_operator (Cairo.Operator.OVER);
@ -225,43 +226,29 @@ namespace Gala {
// more than one => we need a folder
Drawing.Utilities.cairo_rounded_rectangle (
cr,
0.5 * scale_factor,
0.5 * scale_factor,
(int) width - InternalUtils.scale_to_int (1, scale_factor),
(int) height - InternalUtils.scale_to_int (1, scale_factor),
0,
0,
(int) width,
(int) height,
InternalUtils.scale_to_int (5, scale_factor)
);
var shadow_effect = new ShadowEffect (40) {
scale_factor = scale_factor
};
if (drag_action.dragging) {
const double BG_COLOR = 53.0 / 255.0;
cr.set_source_rgba (BG_COLOR, BG_COLOR, BG_COLOR, 0.7);
const double BG_COLOR = 35.0 / 255.0;
cr.set_source_rgba (BG_COLOR, BG_COLOR, BG_COLOR, 0.8);
shadow_effect.css_class = "workspace-switcher-dnd";
} else {
cr.set_source_rgba (0, 0, 0, 0.1);
cr.set_source_rgba (0, 0, 0, 0.3);
shadow_effect.css_class = "workspace-switcher";
}
add_effect (shadow_effect);
cr.fill_preserve ();
cr.set_line_width (InternalUtils.scale_to_int (1, scale_factor));
var grad = new Cairo.Pattern.linear (0, 0, 0, height);
grad.add_color_stop_rgba (0.8, 0, 0, 0, 0);
grad.add_color_stop_rgba (1.0, 1, 1, 1, 0.1);
cr.set_source (grad);
cr.stroke ();
Drawing.Utilities.cairo_rounded_rectangle (
cr,
1.5 * scale_factor,
1.5 * scale_factor,
(int) width - InternalUtils.scale_to_int (3, scale_factor),
(int) height - InternalUtils.scale_to_int (3, scale_factor),
InternalUtils.scale_to_int (5, scale_factor)
);
cr.set_source_rgba (0, 0, 0, 0.3);
cr.stroke ();
// it's not safe to to call meta_workspace_index() here, we may be still animating something
// while the workspace is already gone, which would result in a crash.
unowned Meta.WorkspaceManager manager = workspace.get_display ().get_workspace_manager ();
@ -284,27 +271,23 @@ namespace Gala {
var offset = scaled_size / 2 - InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor) / 2;
buffer.context.rectangle (
InternalUtils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - InternalUtils.scale_to_int (PLUS_SIZE / 2, scale_factor) + 0.5 + offset,
0.5 + offset,
InternalUtils.scale_to_int (PLUS_SIZE, scale_factor) - 1,
InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor) - 1
InternalUtils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - InternalUtils.scale_to_int (PLUS_SIZE / 2, scale_factor) + offset,
offset,
InternalUtils.scale_to_int (PLUS_SIZE, scale_factor),
InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor)
);
buffer.context.rectangle (0.5 + offset,
InternalUtils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - InternalUtils.scale_to_int (PLUS_SIZE / 2, scale_factor) + 0.5 + offset,
InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor) - 1,
InternalUtils.scale_to_int (PLUS_SIZE, scale_factor) - 1
buffer.context.rectangle (offset,
InternalUtils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - InternalUtils.scale_to_int (PLUS_SIZE / 2, scale_factor) + offset,
InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor),
InternalUtils.scale_to_int (PLUS_SIZE, scale_factor)
);
buffer.context.set_source_rgb (0, 0, 0);
buffer.context.fill_preserve ();
buffer.exponential_blur (5);
buffer.context.set_source_rgb (1, 1, 1);
buffer.context.set_line_width (1);
buffer.context.stroke_preserve ();
buffer.context.set_source_rgb (0.8, 0.8, 0.8);
buffer.context.set_source_rgba (1, 1, 1, 0.95);
buffer.context.fill ();
cr.set_source_surface (buffer.surface, 0, 0);