daleclack
/
My_GtkUi
mirror of https://github.com/daleclack/My_GtkUi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve style for launchpad and finder

This commit is contained in:
daleclack 2023-11-09 10:52:06 +08:00
parent 1a548f986e
commit bad0e48b10
4 changed files with 631 additions and 643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1146
Gtk4_Reset/res/mydock.ui
View File

File diff suppressed because it is too large Load Diff

25
Gtk4_Reset/res/style.css
View File

@ -11,15 +11,20 @@
background-color:alpha(white,0.55);
}
/* Background color in the box should be transparent*/
.finder_buttons box{
background-color: transparent;
}
.finder_buttons separator{
background-color: transparent;
}
.dock_style box{
.dock_style grid{
background-color: alpha(white, 0.5);
}
/* Background color in the box should be transparent*/
.default_style box{
background-color: transparent;
}
.default_style separator{
background-color: transparent;
}
.default_style grid{
background-color: transparent;
}

47
Gtk4_Reset/src/ui/MyDock.cpp
View File

@ -16,6 +16,9 @@ struct _MyDock
GtkWidget *main_pic, *finder;
GtkWidget *btnlaunch, *launchpad_stack, // launchpad
*default_page, *launchpad_page;
GtkWidget *padabout, *padaud, *paddraw, *padfile, *padgedit, // Launchpad icons
*padgame, *padimage, *padnote, *padedit, *padvlc, *padvlc_win32,
*padrun, *padset, *padgame24, *padcalc, *padmine;
PadPage current_page;
GtkBuilder *menu_builder;
GMenuModel *menu_model;
@ -59,14 +62,6 @@ static void pressed(GtkGesture *gesture, int n_press,
gtk_popover_popup(GTK_POPOVER(dock->context_menu));
}
static void my_dock_add_style(MyDock *self, GtkStyleProvider *provider)
{
gtk_widget_add_css_class(self->launchpad_page, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(self->launchpad_page),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
static void my_dock_init(MyDock *self)
{
// Builder for the main dock
@ -82,6 +77,22 @@ static void my_dock_init(MyDock *self)
self->launchpad_stack = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "launchpad_stack"));
self->default_page = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "default_page"));
self->launchpad_page = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "launchpad_page"));
self->padaud = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padaud"));
self->padabout = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padabout"));
self->padcalc = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padcalc"));
self->paddraw = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "paddraw"));
self->padedit = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padedit"));
self->padfile = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padfile"));
self->padgame24 = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padgame24"));
self->padgame = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padgame"));
self->padgedit = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padgedit"));
self->padimage = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padimage"));
self->padmine = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padmine"));
self->padnote = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padnote"));
self->padrun = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padrun"));
self->padset = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padset"));
self->padvlc = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padvlc"));
self->padvlc_win32 = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padvlc_win32"));
// Launchpad default
self->current_page = MainPage;
@ -117,22 +128,26 @@ static void my_dock_init(MyDock *self)
// Link Signals
g_signal_connect(self->btnlaunch, "clicked", G_CALLBACK(btnlaunch_clicked), self);
// Add Style for finder
// Create Css Provider for styling
GtkCssProvider *provider = gtk_css_provider_new();
gtk_css_provider_load_from_resource(provider, "/org/gtk/daleclack/style.css");
gtk_widget_add_css_class(self->finder_box, "finder_box");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(self->finder_box),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
// Add Style for finder
my_finder_add_style(MY_FINDER(self->finder), provider);
// Add Style to launchpad page
GtkWidget *parent = gtk_widget_get_parent(self->launchpad_page);
gtk_widget_add_css_class(parent, "dock_style");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(parent),
gtk_widget_add_css_class(self->launchpad_page, "dock_style");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(self->launchpad_page),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
// The widget in the launchpad page should use default style
GtkWidget *child = gtk_grid_get_child_at(GTK_GRID(self->launchpad_page), 0, 0);
gtk_widget_add_css_class(child, "default_style");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(child),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
// Pack widgets
// Dock position and mode, will be changable soon

56
Gtk4_Reset/src/ui/MyFinder.cpp
View File

@ -135,57 +135,17 @@ static void my_finder_init(MyFinder *self)
void my_finder_add_style(MyFinder *finder, GtkCssProvider *provider)
{
// Main finder style
GtkWidget *parent = gtk_widget_get_parent(GTK_WIDGET(finder));
gtk_widget_add_css_class(parent, "finder_box");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(parent),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
// Make box in the buttons transparent
gtk_widget_add_css_class(finder->btn_icon, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btn_icon),
gtk_widget_add_css_class(GTK_WIDGET(finder), "default_style");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(GTK_WIDGET(finder)),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->btntitle, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btntitle),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->btnfile, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btnfile),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->btnedit, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btnedit),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->btnshow, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btnshow),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->btngoto, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btngoto),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->btnwin, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btnwin),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->btnhelp, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->btnhelp),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->time_button, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->time_button),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_widget_add_css_class(finder->menu_button, "finder_buttons");
gtk_style_context_add_provider_for_display(gtk_widget_get_display(finder->menu_button),
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
static void my_finder_class_init(MyFinderClass *klass)