mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Fix flicker/animation when transitioning from fullscreen to maximized

Browse Source
This commit is contained in:
dannye 2024-11-09 17:11:16 -06:00 committed by ManoloFLTK
parent 2337214e4e
commit 29531fa421
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
View File

@ -577,13 +577,6 @@ void Fl_WinAPI_Window_Driver::fullscreen_on() {
} }
static void delayed_maximize(Fl_Window *win){
Fl::remove_check((Fl_Timeout_Handler)delayed_maximize, win);
win->un_maximize();
win->maximize();
}
void Fl_WinAPI_Window_Driver::fullscreen_off(int X, int Y, int W, int H) { void Fl_WinAPI_Window_Driver::fullscreen_off(int X, int Y, int W, int H) {
pWindow->_clear_fullscreen(); pWindow->_clear_fullscreen();
DWORD style = GetWindowLong(fl_xid(pWindow), GWL_STYLE); DWORD style = GetWindowLong(fl_xid(pWindow), GWL_STYLE);
@ -606,22 +599,28 @@ void Fl_WinAPI_Window_Driver::fullscreen_off(int X, int Y, int W, int H) {
break; break;
} }
Fl_X::flx(pWindow)->xid = (fl_uintptr_t)xid; Fl_X::flx(pWindow)->xid = (fl_uintptr_t)xid;
// compute window position and size in scaled units
float s = Fl::screen_driver()->scale(screen_num());
int scaledX = int(ceil(X*s)), scaledY= int(ceil(Y*s)), scaledW = int(ceil(W*s)), scaledH = int(ceil(H*s));
// Adjust for decorations (but not if that puts the decorations
// outside the screen)
if ((X != x()) || (Y != y())) {
scaledX -= bx;
scaledY -= by+bt;
}
scaledW += bx*2;
scaledH += by*2+bt;
SetWindowLong(fl_xid(pWindow), GWL_STYLE, style); SetWindowLong(fl_xid(pWindow), GWL_STYLE, style);
SetWindowPos(fl_xid(pWindow), 0, scaledX, scaledY, scaledW, scaledH, if (!pWindow->maximize_active()) {
SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED); // compute window position and size in scaled units
float s = Fl::screen_driver()->scale(screen_num());
int scaledX = int(ceil(X*s)), scaledY= int(ceil(Y*s)), scaledW = int(ceil(W*s)), scaledH = int(ceil(H*s));
// Adjust for decorations (but not if that puts the decorations
// outside the screen)
if ((X != x()) || (Y != y())) {
scaledX -= bx;
scaledY -= by+bt;
}
scaledW += bx*2;
scaledH += by*2+bt;
SetWindowPos(fl_xid(pWindow), 0, scaledX, scaledY, scaledW, scaledH,
SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED);
} else {
int WX, WY, WW, WH;
((Fl_WinAPI_Screen_Driver*)Fl::screen_driver())->screen_xywh_unscaled(WX, WY, WW, WH, screen_num());
SetWindowPos(fl_xid(pWindow), 0, WX, WY, WW, WH,
SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED);
}
Fl::handle(FL_FULLSCREEN, pWindow); Fl::handle(FL_FULLSCREEN, pWindow);
if (pWindow->maximize_active()) Fl::add_check((Fl_Timeout_Handler)delayed_maximize, pWindow);
} }