mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 20:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

GTK: Make page info transient properly, handle events, etc.

Browse Source 
This makes the page info properly transient and causes it
to handle activity in the corewindow and outside itself
properly.  This includes ensuring that actions outside
the window will close it, etc.

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2020-05-08 20:42:49 +01:00
parent b426623258
commit 524688098a
No known key found for this signature in database
GPG Key ID: C30DF439F2987D74
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontends/gtk/page_info.c
View File

@ -29,8 +29,10 @@
#include "utils/messages.h" #include "utils/messages.h"
#include "netsurf/keypress.h" #include "netsurf/keypress.h"
#include "netsurf/plotters.h" #include "netsurf/plotters.h"
#include "netsurf/misc.h"
#include "netsurf/browser_window.h" #include "netsurf/browser_window.h"
#include "desktop/page-info.h" #include "desktop/page-info.h"
#include "desktop/gui_internal.h"
#include "gtk/plotters.h" #include "gtk/plotters.h"
#include "gtk/scaffolding.h" #include "gtk/scaffolding.h"
@ -73,6 +75,15 @@ nsgtk_pi_delete_event(GtkWidget *w, GdkEvent *event, gpointer data)
return FALSE; return FALSE;
} }
/**
* Called to cause the page-info window to close cleanly
*/
static void
nsgtk_pi_close_callback(void *pw)
{
nsgtk_pi_delete_event(NULL, NULL, pw);
}
/** /**
* callback for mouse action for certificate verify on core window * callback for mouse action for certificate verify on core window
* *
@ -88,10 +99,16 @@ nsgtk_pi_mouse(struct nsgtk_corewindow *nsgtk_cw,
int x, int y) int x, int y)
{ {
struct nsgtk_pi_window *pi_win; struct nsgtk_pi_window *pi_win;
bool did_something = false;
/* technically degenerate container of */ /* technically degenerate container of */
pi_win = (struct nsgtk_pi_window *)nsgtk_cw; pi_win = (struct nsgtk_pi_window *)nsgtk_cw;
page_info_mouse_action(pi_win->pi, mouse_state, x, y); if (page_info_mouse_action(pi_win->pi, mouse_state, x, y, &did_something) == NSERROR_OK) {
if (did_something == true) {
/* Something happened so we need to close ourselves */
guit->misc->schedule(0, nsgtk_pi_close_callback, pi_win);
}
}
return NSERROR_OK; return NSERROR_OK;
} }
@ -147,6 +164,7 @@ nserror nsgtk_page_info(struct browser_window *bw)
{ {
struct nsgtk_pi_window *ncwin; struct nsgtk_pi_window *ncwin;
nserror res; nserror res;
GtkWindow *scaffwin = nsgtk_scaffolding_window(nsgtk_current_scaffolding());
ncwin = calloc(1, sizeof(struct nsgtk_pi_window)); ncwin = calloc(1, sizeof(struct nsgtk_pi_window));
if (ncwin == NULL) { if (ncwin == NULL) {
@ -165,9 +183,19 @@ nserror nsgtk_page_info(struct browser_window *bw)
ncwin->dlg = GTK_WINDOW(gtk_builder_get_object(ncwin->builder, ncwin->dlg = GTK_WINDOW(gtk_builder_get_object(ncwin->builder,
"PGIWindow")); "PGIWindow"));
/* set parent for transient dialog */ /* Configure for transient behaviour */
gtk_window_set_transient_for(GTK_WINDOW(ncwin->dlg), gtk_window_set_type_hint(GTK_WINDOW(ncwin->dlg),
nsgtk_scaffolding_window(nsgtk_current_scaffolding())); GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU);
gtk_window_set_modal(GTK_WINDOW(ncwin->dlg), TRUE);
gtk_window_group_add_window(gtk_window_get_group(scaffwin),
GTK_WINDOW(ncwin->dlg));
gtk_window_set_transient_for(GTK_WINDOW(ncwin->dlg), scaffwin);
gtk_window_set_screen(GTK_WINDOW(ncwin->dlg),
gtk_widget_get_screen(GTK_WIDGET(scaffwin)));
ncwin->core.drawing_area = GTK_DRAWING_AREA( ncwin->core.drawing_area = GTK_DRAWING_AREA(
gtk_builder_get_object(ncwin->builder, "PGIDrawingArea")); gtk_builder_get_object(ncwin->builder, "PGIDrawingArea"));
@ -177,6 +205,16 @@ nserror nsgtk_page_info(struct browser_window *bw)
"delete_event", "delete_event",
G_CALLBACK(nsgtk_pi_delete_event), G_CALLBACK(nsgtk_pi_delete_event),
ncwin); ncwin);
/* Ditto if we lose the grab */
g_signal_connect(G_OBJECT(ncwin->dlg),
"grab-broken-event",
G_CALLBACK(nsgtk_pi_delete_event),
ncwin);
/* Handle button press events */
g_signal_connect(G_OBJECT(ncwin->dlg),
"button-press-event",
G_CALLBACK(nsgtk_pi_delete_event),
ncwin);
/* initialise GTK core window */ /* initialise GTK core window */
ncwin->core.draw = nsgtk_pi_draw; ncwin->core.draw = nsgtk_pi_draw;
@ -201,5 +239,7 @@ nserror nsgtk_page_info(struct browser_window *bw)
gtk_widget_show(GTK_WIDGET(ncwin->dlg)); gtk_widget_show(GTK_WIDGET(ncwin->dlg));
gtk_widget_grab_focus(GTK_WIDGET(ncwin->dlg));
return NSERROR_OK; return NSERROR_OK;
} }