r2927 jmb - /trunk/netsurf/gtk/gtk_window.c

Author: jmb Date: Thu Sep 7 21:27:59 2006 New Revision: 2927 URL: http://svn.semichrome.net?rev=2927&view=rev Log: Fix GTK build Modified: trunk/netsurf/gtk/gtk_window.c Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=2927&r1=... ============================================================================== --- trunk/netsurf/gtk/gtk_window.c (original) +++ trunk/netsurf/gtk/gtk_window.c Thu Sep 7 21:27:59 2006 @@ -965,16 +965,6 @@ } -int gui_window_get_width(struct gui_window* g) -{ - return GTK_WIDGET(g->drawing_area)->allocation.width; -} - -int gui_window_get_height(struct gui_window* g) -{ - return GTK_WIDGET(g->drawing_area)->allocation.height; -} - void gui_window_update_extent(struct gui_window *g) { if (!g->bw->current_content) @@ -1197,10 +1187,16 @@ } -void gui_window_get_dimensions(struct gui_window *g, int *width, int *height) -{ - *width = 1; - *height = 1; +void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, + bool scaled) +{ + *width = GTK_WIDGET(g->drawing_area)->allocation.width; + *height = GTK_WIDGET(g->drawing_area)->allocation.height; + + if (scaled) { + *width /= g->scale; + *height /= g->scale; + } } void gui_window_position_frame(struct gui_window *g, int x0, int y0, int x1, int y1)