diff --git a/data/Application.css b/data/Application.css index b33fc50b..96d5aac2 100644 --- a/data/Application.css +++ b/data/Application.css @@ -3,6 +3,20 @@ * SPDX-FileCopyrightText: 2023 elementary, Inc. (https://elementary.io) */ +dock { + background: alpha(@bg_color, 0.6); + border-radius: 9px; + box-shadow: + inset 0 -1px 0 0 alpha(@highlight_color, 0.1), + inset 0 1px 0 0 alpha(@highlight_color, 0.15), + inset 1px 0 0 0 alpha(@highlight_color, 0.035), + inset -1px 0 0 0 alpha(@highlight_color, 0.035), + 0 0 0 1px alpha(@borders, 0.4), + 0 1px 3px alpha(black, 0.10), + 0 3px 9px alpha(black, 0.15); + margin: 0 12px 12px 12px; +} + launcher { padding: 6px; } diff --git a/data/MainWindow.css b/data/MainWindow.css deleted file mode 100644 index 88f57b7f..00000000 --- a/data/MainWindow.css +++ /dev/null @@ -1,17 +0,0 @@ -/* - * SPDX-License-Identifier: GPL-3.0 - * SPDX-FileCopyrightText: 2022 elementary, Inc. (https://elementary.io) - */ - -dock { - background: alpha(@bg_color, 0.7); - border-radius: 6px; - box-shadow: - inset 0 -1px 0 0 alpha(@highlight_color, 0.2), - inset 0 1px 0 0 alpha(@highlight_color, 0.3), - inset 1px 0 0 0 alpha(@highlight_color, 0.07), - inset -1px 0 0 0 alpha(@highlight_color, 0.07), - 0 0 0 1px alpha(@borders, 0.5), - 0 1px 3px alpha(black, 0.12), - 0 1px 2px alpha(black, 0.24); -} diff --git a/data/dock.gresource.xml b/data/dock.gresource.xml index 9455a933..6b68ec1c 100644 --- a/data/dock.gresource.xml +++ b/data/dock.gresource.xml @@ -2,7 +2,6 @@ Application.css - MainWindow.css poof.svg diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 8d6514a0..f7aad872 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -4,30 +4,17 @@ */ public class Dock.MainWindow : Gtk.ApplicationWindow { - private static Gtk.CssProvider css_provider; - class construct { set_css_name ("dock"); } - static construct { - css_provider = new Gtk.CssProvider (); - css_provider.load_from_resource ("/io/elementary/dock/MainWindow.css"); - } - construct { - get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - var launcher_manager = LauncherManager.get_default (); - var empty_title = new Gtk.Label ("") { - visible = false - }; - child = launcher_manager; - overflow = Gtk.Overflow.VISIBLE; + overflow = VISIBLE; resizable = false; - set_titlebar (empty_title); + titlebar = new Gtk.Label ("") { visible = false }; // Fixes DnD reordering of launchers failing on a very small line between two launchers var drop_target_launcher = new Gtk.DropTarget (typeof (Launcher), MOVE);