AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

window: Get rid of the inspector_window static

Browse Source 
Use the new per-display inspector plumbing and
stop relying on a static variable.
This commit is contained in:
Matthias Clasen 2019-12-07 11:08:34 -05:00
parent a207a4b3cd
commit 917181cb67
1 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gtk/gtkwindow.c
View File

@ -8965,9 +8965,12 @@ _gtk_window_raise_popover (GtkWindow *window,
} }
} }
static GtkWidget *inspector_window = NULL;
static void set_warn_again (gboolean warn); static void set_warn_again (gboolean warn);
static void gtk_window_set_debugging (GdkDisplay *display,
gboolean enable,
gboolean toggle,
gboolean select,
gboolean warn);
static void static void
warn_response (GtkDialog *dialog, warn_response (GtkDialog *dialog,
@ -8975,27 +8978,22 @@ warn_response (GtkDialog *dialog,
{ {
GtkWidget *check; GtkWidget *check;
gboolean remember; gboolean remember;
GtkWidget *inspector_window;
GdkDisplay *display;
inspector_window = GTK_WIDGET (gtk_window_get_transient_for (GTK_WINDOW (dialog)));
display = gtk_inspector_window_get_inspected_display (GTK_INSPECTOR_WINDOW (inspector_window));
check = g_object_get_data (G_OBJECT (dialog), "check"); check = g_object_get_data (G_OBJECT (dialog), "check");
remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)); remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
gtk_widget_destroy (GTK_WIDGET (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_set_data (G_OBJECT (inspector_window), "warning_dialog", NULL); g_object_set_data (G_OBJECT (inspector_window), "warning_dialog", NULL);
if (response == GTK_RESPONSE_NO)
{
GtkWidget *window;
/* Steal reference into temp variable, so not to mess up with if (response == GTK_RESPONSE_NO)
* inspector_window during gtk_widget_destroy(). gtk_window_set_debugging (display, FALSE, FALSE, FALSE, FALSE);
*/
window = inspector_window;
inspector_window = NULL;
gtk_widget_destroy (window);
}
else else
{
set_warn_again (!remember); set_warn_again (!remember);
}
} }
static void static void
@ -9008,21 +9006,22 @@ gtk_window_set_debugging (GdkDisplay *display,
GtkWidget *dialog = NULL; GtkWidget *dialog = NULL;
GtkWidget *area; GtkWidget *area;
GtkWidget *check; GtkWidget *check;
GtkWidget *inspector_window;
if (toggle)
{
gboolean was_debugging; gboolean was_debugging;
was_debugging = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (display), "-gtk-debugging-enabled")); was_debugging = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (display), "-gtk-debugging-enabled"));
if (toggle)
enable = !was_debugging; enable = !was_debugging;
}
g_object_set_data (G_OBJECT (display), "-gtk-debugging-enabled", GINT_TO_POINTER (enable)); g_object_set_data (G_OBJECT (display), "-gtk-debugging-enabled", GINT_TO_POINTER (enable));
if (enable && inspector_window == NULL) if (enable)
{ {
inspector_window = gtk_inspector_window_get (display); inspector_window = gtk_inspector_window_get (display);
gtk_window_present (GTK_WINDOW (inspector_window));
if (warn) if (warn)
{ {
dialog = gtk_message_dialog_new (GTK_WINDOW (inspector_window), dialog = gtk_message_dialog_new (GTK_WINDOW (inspector_window),
@ -9043,27 +9042,19 @@ gtk_window_set_debugging (GdkDisplay *display,
g_object_set_data (G_OBJECT (dialog), "check", check); g_object_set_data (G_OBJECT (dialog), "check", check);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_NO); gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_NO);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_YES); gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_YES);
g_signal_connect (dialog, "response", G_CALLBACK (warn_response), NULL); g_signal_connect (dialog, "response", G_CALLBACK (warn_response), inspector_window);
g_object_set_data (G_OBJECT (inspector_window), "warning_dialog", dialog); g_object_set_data (G_OBJECT (inspector_window), "warning_dialog", dialog);
}
}
dialog = g_object_get_data (G_OBJECT (inspector_window), "warning_dialog");
if (enable)
{
gtk_window_present (GTK_WINDOW (inspector_window));
if (dialog)
gtk_widget_show (dialog); gtk_widget_show (dialog);
}
if (select) if (select)
gtk_inspector_window_select_widget_under_pointer (GTK_INSPECTOR_WINDOW (inspector_window)); gtk_inspector_window_select_widget_under_pointer (GTK_INSPECTOR_WINDOW (inspector_window));
} }
else else if (was_debugging)
{ {
if (dialog) inspector_window = gtk_inspector_window_get (display);
gtk_widget_hide (dialog);
if (inspector_window)
gtk_widget_hide (inspector_window); gtk_widget_hide (inspector_window);
} }
} }