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

Adjust some functions

This commit is contained in:
daleclack 2024-05-09 17:21:41 +08:00
parent 172c8033f9
commit 0ad357ed46
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Gtk4_Reset/src/ui/AppView.cpp
View File

@ -23,7 +23,7 @@ static GListModel *create_app_model()
return G_LIST_MODEL(store); return G_LIST_MODEL(store);
} }
static void app_view_setup(GtkListItemFactory *factory, GtkListItem *item) static void app_ext_view_setup(GtkListItemFactory *factory, GtkListItem *item)
{ {
GtkWidget *app_box, *image, *label; GtkWidget *app_box, *image, *label;
@ -42,7 +42,7 @@ static void app_view_setup(GtkListItemFactory *factory, GtkListItem *item)
gtk_list_item_set_child(item, app_box); gtk_list_item_set_child(item, app_box);
} }
static void app_view_bind(GtkListItemFactory *factory, GtkListItem *item) static void app_ext_view_bind(GtkListItemFactory *factory, GtkListItem *item)
{ {
GtkWidget *image; GtkWidget *image;
GtkWidget *label; GtkWidget *label;
@ -55,10 +55,12 @@ static void app_view_bind(GtkListItemFactory *factory, GtkListItem *item)
// Initalize widgets // Initalize widgets
GIcon *icon = g_app_info_get_icon(app_info); GIcon *icon = g_app_info_get_icon(app_info);
if(!icon) if (!icon)
{ {
gtk_image_set_from_icon_name(GTK_IMAGE(image), "application-x-executable"); gtk_image_set_from_icon_name(GTK_IMAGE(image), "application-x-executable");
}else{ }
else
{
gtk_image_set_from_gicon(GTK_IMAGE(image), g_app_info_get_icon(app_info)); gtk_image_set_from_gicon(GTK_IMAGE(image), g_app_info_get_icon(app_info));
} }
gtk_label_set_label(GTK_LABEL(label), g_app_info_get_display_name(app_info)); gtk_label_set_label(GTK_LABEL(label), g_app_info_get_display_name(app_info));
@ -99,7 +101,7 @@ static void app_view_activate(GtkGridView *list, guint position, gpointer data)
g_object_unref(app_info); g_object_unref(app_info);
} }
GtkWidget *app_view_new() GtkWidget *app_view_new(gboolean external)
{ {
GtkWidget *list, *sw; GtkWidget *list, *sw;
GListModel *model; GListModel *model;
@ -110,17 +112,22 @@ GtkWidget *app_view_new()
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
// Create list item factory // Create view for external applications
factory = gtk_signal_list_item_factory_new(); if (external)
g_signal_connect(factory, "setup", G_CALLBACK(app_view_setup), NULL); {
g_signal_connect(factory, "bind", G_CALLBACK(app_view_bind), NULL); // Create list item factory
factory = gtk_signal_list_item_factory_new();
g_signal_connect(factory, "setup", G_CALLBACK(app_ext_view_setup), NULL);
g_signal_connect(factory, "bind", G_CALLBACK(app_ext_view_bind), NULL);
// Create model and view
model = create_app_model();
list = gtk_grid_view_new(GTK_SELECTION_MODEL(
gtk_single_selection_new(model)),
factory);
g_signal_connect(list, "activate", G_CALLBACK(app_view_activate), NULL);
}
// Create model and view
model = create_app_model();
list = gtk_grid_view_new(GTK_SELECTION_MODEL(
gtk_single_selection_new(model)),
factory);
g_signal_connect(list, "activate", G_CALLBACK(app_view_activate), NULL);
gtk_grid_view_set_min_columns(GTK_GRID_VIEW(list), 8); gtk_grid_view_set_min_columns(GTK_GRID_VIEW(list), 8);
// Add Child // Add Child

2
Gtk4_Reset/src/ui/AppView.h
View File

@ -2,4 +2,4 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
GtkWidget *app_view_new(); GtkWidget *app_view_new(gboolean external);

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

@ -893,7 +893,7 @@ static void my_dock_init(MyDock *self)
gtk_grid_set_row_spacing(GTK_GRID(self->apps_grid), 20); gtk_grid_set_row_spacing(GTK_GRID(self->apps_grid), 20);
// Add Addon apps view // Add Addon apps view
self->apps_view = app_view_new(); self->apps_view = app_view_new(TRUE);
gtk_box_append(GTK_BOX(self->addon_box), self->apps_view); gtk_box_append(GTK_BOX(self->addon_box), self->apps_view);
gtk_widget_set_halign(self->addon_box, GTK_ALIGN_CENTER); gtk_widget_set_halign(self->addon_box, GTK_ALIGN_CENTER);
gtk_widget_set_halign(self->apps_view, GTK_ALIGN_CENTER); gtk_widget_set_halign(self->apps_view, GTK_ALIGN_CENTER);