From 0719c5771c73aba2def50e31582a1df7c3bb5adc Mon Sep 17 00:00:00 2001 From: daleclack Date: Sun, 21 May 2023 00:14:02 +0800 Subject: [PATCH] Fix css styles --- Gtkmm4_Mac/res/dock_style.css | 3 +-- Gtkmm4_Mac/res/style.css | 2 +- Gtkmm4_Mac/src/ui/MyDock.cc | 3 ++- Gtkmm4_Mac/src/ui/MyFinder.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gtkmm4_Mac/res/dock_style.css b/Gtkmm4_Mac/res/dock_style.css index 53cfaaf..d4b9be1 100644 --- a/Gtkmm4_Mac/res/dock_style.css +++ b/Gtkmm4_Mac/res/dock_style.css @@ -5,11 +5,10 @@ 变更会立即应用到全局，影响整个应用程序。 */ -@import url("resource://org/gtk/daleclack/reset.css"); +/* @import url("resource://org/gtk/daleclack/reset.css"); */ dock_box{ background-color:alpha(gray,0.3); - color:white; } dock_separator{ diff --git a/Gtkmm4_Mac/res/style.css b/Gtkmm4_Mac/res/style.css index 63960e7..0b2ba70 100644 --- a/Gtkmm4_Mac/res/style.css +++ b/Gtkmm4_Mac/res/style.css @@ -5,7 +5,7 @@ 变更会立即应用到全局，影响整个应用程序。 */ -@import url("resource://org/gtk/daleclack/reset.css"); +/* @import url("resource://org/gtk/daleclack/reset.css"); */ .finder_box{ background-color:alpha(gray,0.7); diff --git a/Gtkmm4_Mac/src/ui/MyDock.cc b/Gtkmm4_Mac/src/ui/MyDock.cc index 0cc458d..c7b77a3 100644 --- a/Gtkmm4_Mac/src/ui/MyDock.cc +++ b/Gtkmm4_Mac/src/ui/MyDock.cc @@ -207,7 +207,7 @@ MyDock::MyDock(BaseObjectType *cobject, const Glib::RefPtr &ref_Gl void MyDock::apply_style(Gtk::Widget &widget) { Gtk::CssProvider::add_provider_for_display(widget.get_display(), provider, - GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } // Launchpad @@ -524,6 +524,7 @@ void MyDock::window_ctrl(Gtk::Window &window, bool on_dock) Gdk::Toplevel::State::MINIMIZED: The window is minimized the default mode for first launch */ + // Use C API because of crash of C++ APIS auto state = gdk_toplevel_get_state(GDK_TOPLEVEL(surface)); switch (state) { diff --git a/Gtkmm4_Mac/src/ui/MyFinder.cc b/Gtkmm4_Mac/src/ui/MyFinder.cc index 8beb23f..2ce6e63 100644 --- a/Gtkmm4_Mac/src/ui/MyFinder.cc +++ b/Gtkmm4_Mac/src/ui/MyFinder.cc @@ -135,9 +135,9 @@ MyFinder::MyFinder() provider = Gtk::CssProvider::create(); provider->load_from_resource("/org/gtk/daleclack/style.css"); Gtk::CssProvider::add_provider_for_display(get_display(), provider, - GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); Gtk::CssProvider::add_provider_for_display(separator.get_display(), provider, - GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } bool MyFinder::time_out()