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

Merge GTK window size fixes from 'pre-0.77'.

Browse Source
This commit is contained in:
Simon Tatham 2022-02-03 18:45:51 +00:00
commit 72c492926f
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unix/window.c
View File

@ -736,10 +736,8 @@ static void drawing_area_setup(GtkFrontend *inst, int width, int height)
new_scale = 1; new_scale = 1;
#endif #endif
int new_backing_w = w * inst->font_width + 2*inst->window_border; int new_backing_w = width * new_scale;
int new_backing_h = h * inst->font_height + 2*inst->window_border; int new_backing_h = height * new_scale;
new_backing_w *= new_scale;
new_backing_h *= new_scale;
if (inst->backing_w != new_backing_w || inst->backing_h != new_backing_h) if (inst->backing_w != new_backing_w || inst->backing_h != new_backing_h)
inst->drawing_area_setup_needed = true; inst->drawing_area_setup_needed = true;
@ -2477,9 +2475,7 @@ static void compute_whole_window_size(GtkFrontend *inst,
static void gtkwin_deny_term_resize(void *vctx) static void gtkwin_deny_term_resize(void *vctx)
{ {
GtkFrontend *inst = (GtkFrontend *)vctx; GtkFrontend *inst = (GtkFrontend *)vctx;
if (inst->term) drawing_area_setup_simple(inst);
term_size(inst->term, inst->term->rows, inst->term->cols,
inst->term->savelines);
} }
static void gtkwin_request_resize(TermWin *tw, int w, int h) static void gtkwin_request_resize(TermWin *tw, int w, int h)
@ -3756,16 +3752,12 @@ static void draw_stretch_after(GtkFrontend *inst, int x, int y,
static void draw_backing_rect(GtkFrontend *inst) static void draw_backing_rect(GtkFrontend *inst)
{ {
int w, h;
if (!win_setup_draw_ctx(&inst->termwin)) if (!win_setup_draw_ctx(&inst->termwin))
return; return;
w = inst->width * inst->font_width + 2*inst->window_border;
h = inst->height * inst->font_height + 2*inst->window_border;
draw_set_colour(inst, 258, false); draw_set_colour(inst, 258, false);
draw_rectangle(inst, true, 0, 0, w, h); draw_rectangle(inst, true, 0, 0, inst->backing_w, inst->backing_h);
draw_update(inst, 0, 0, w, h); draw_update(inst, 0, 0, inst->backing_w, inst->backing_h);
win_free_draw_ctx(&inst->termwin); win_free_draw_ctx(&inst->termwin);
} }