nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-27 02:02:26 +00:00
Code Issues Projects Releases Wiki Activity

gtkwin: factor out drawing_area_setup_simple().

Browse Source 
I'm about to want to do this operation from more places, so here's a
minor NFC refactoring that will simplify the next commit.
This commit is contained in:
Simon Tatham 2018-05-11 09:00:46 +01:00
parent b72f0baed6
commit 1ca03a186f
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
unix/gtkwin.c
View File

@ -699,21 +699,31 @@ static void drawing_area_setup(struct gui_data *inst, int width, int height)
#endif #endif
} }
static void drawing_area_setup_simple(struct gui_data *inst)
{
/*
* Wrapper on drawing_area_setup which fetches the width and
* height of the drawing area. We go directly to the inner version
* in the case where a new size allocation comes in (just in case
* GTK hasn't installed it in the normal place yet).
*/
#if GTK_CHECK_VERSION(2,0,0)
GdkRectangle alloc;
gtk_widget_get_allocation(inst->area, &alloc);
#else
GtkAllocation alloc = inst->area->allocation;
#endif
drawing_area_setup(inst, alloc.width, alloc.height);
}
static void area_realised(GtkWidget *widget, gpointer data) static void area_realised(GtkWidget *widget, gpointer data)
{ {
struct gui_data *inst = (struct gui_data *)data; struct gui_data *inst = (struct gui_data *)data;
inst->drawing_area_realised = TRUE; inst->drawing_area_realised = TRUE;
if (inst->drawing_area_realised && inst->drawing_area_got_size && if (inst->drawing_area_realised && inst->drawing_area_got_size &&
!inst->drawing_area_setup_done) { !inst->drawing_area_setup_done)
#if GTK_CHECK_VERSION(2,0,0) drawing_area_setup_simple(inst);
GdkRectangle alloc;
gtk_widget_get_allocation(inst->area, &alloc);
#else
GtkAllocation alloc = inst->area->allocation;
#endif
drawing_area_setup(inst, alloc.width, alloc.height);
}
} }
static void area_size_allocate( static void area_size_allocate(