correct full zoom when swicthing full screen

This commit is contained in:
Stefan Frederik 2022-09-16 08:43:01 +02:00
parent 3866dc914e
commit 5305e593ff
1 changed files with 7 additions and 6 deletions

View File

@ -1063,19 +1063,20 @@ void toggle_fullscreen(const char *topwin)
xctx->menu_removed=0; xctx->menu_removed=0;
} }
if(fs == 1) { if(fs == 1) {
xctx->pending_fullzoom=1;
window_state(display , parent_id,fullscr); /* full screen with menus and toolbars */ window_state(display , parent_id,fullscr); /* full screen with menus and toolbars */
} else if(fs == 2) { } else if(fs == 2) {
xctx->pending_fullzoom=2;
window_state(display , parent_id,normal); /* full screen, only drawing area */ window_state(display , parent_id,normal); /* full screen, only drawing area */
window_state(display , parent_id,fullscr); window_state(display , parent_id,fullscr);
zoom_full(1, 0, 1, 0.97); /* draw */
} else { } else {
xctx->pending_fullzoom=1;
window_state(display , parent_id,normal); /* normal view */ window_state(display , parent_id,normal); /* normal view */
/* when switching back from fullscreen multiple ConfigureNotify events are generated. /* when switching back from fullscreen multiple ConfigureNotify events are generated.
* pending_fullzoom does not work on the last corect ConfigureNotify event, * pending_fullzoom does not work on the last corect ConfigureNotify event,
* so wee zoom_full() again */ * so wee zoom_full() again */
zoom_full(1, 0, 1, 0.97); /* draw */
} }
xctx->pending_fullzoom=1; zoom_full(1, 0, 1, 0.97); /* draw */
} }
@ -1860,10 +1861,10 @@ void resetwin(int create_pixmap, int clear_pixmap, int force, int w, int h)
} }
} }
} }
if(xctx->pending_fullzoom) { if(xctx->pending_fullzoom > 0) {
dbg(1, "resetwin(): pending_fulzoom: doing zoom_full()\n"); dbg(1, "resetwin(): pending_fulzoom: doing zoom_full()\n");
zoom_full(0, 0, 1, 0.97); zoom_full(1, 0, 1, 0.97);
xctx->pending_fullzoom=0; xctx->pending_fullzoom--;
} }
dbg(1, "resetwin(): Window reset\n"); dbg(1, "resetwin(): Window reset\n");
} /* end if(has_x) */ } /* end if(has_x) */