varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-11 15:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'active-window' into 'master'

Browse Source 
sysprof: Present the active window on activation

See merge request GNOME/sysprof!132
This commit is contained in:
Christian Hergert
2025-04-01 00:25:17 +00:00
parent 28acf990ff b5459370d7
commit 3c3195425d
1 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/sysprof/sysprof-application.c
View File

@ -42,25 +42,16 @@ static const GOptionEntry option_entries[] = {
static void static void
sysprof_application_activate (GApplication *app) sysprof_application_activate (GApplication *app)
{ {
const GList *windows; GtkWindow *window;
GtkWidget *greeter; GtkWidget *greeter;
g_assert (GTK_IS_APPLICATION (app)); g_assert (GTK_IS_APPLICATION (app));
windows = gtk_application_get_windows (GTK_APPLICATION (app)); window = gtk_application_get_active_window (GTK_APPLICATION (app));
for (const GList *iter = windows; iter != NULL; iter = iter->next) if (window)
{ {
if (SYSPROF_IS_WINDOW (iter->data)) gtk_window_present (window);
{
gtk_window_present (iter->data);
return;
}
}
if (windows)
{
gtk_window_present (windows->data);
return; return;
} }
@ -180,32 +171,21 @@ sysprof_about (GSimpleAction *action,
gpointer user_data) gpointer user_data)
{ {
GtkApplication *app = user_data; GtkApplication *app = user_data;
GtkWindow *best_toplevel = NULL; GtkWindow *window = NULL;
const GList *windows;
g_assert (G_IS_APPLICATION (app)); g_assert (G_IS_APPLICATION (app));
g_assert (G_IS_SIMPLE_ACTION (action)); g_assert (G_IS_SIMPLE_ACTION (action));
g_assert (variant == NULL); g_assert (variant == NULL);
windows = gtk_application_get_windows (app); window = gtk_application_get_active_window (GTK_APPLICATION (app));
if (windows == NULL) if (window == NULL)
{ {
g_warning ("No windows found to show about dialog"); g_warning ("No windows found to show about dialog");
} return;
else
best_toplevel = windows->data;
for (; windows != NULL; windows = windows->next)
{
if (SYSPROF_IS_WINDOW (windows->data))
{
best_toplevel = windows->data;
break;
}
} }
adw_show_about_dialog (GTK_WIDGET (best_toplevel), adw_show_about_dialog (GTK_WIDGET (window),
"application-name", _("Sysprof"), "application-name", _("Sysprof"),
"application-icon", APP_ID_S, "application-icon", APP_ID_S,
"version", "GNOME " PACKAGE_VERSION, "version", "GNOME " PACKAGE_VERSION,