Quellcode durchsuchen

More fullscreen fixes: Do not try to change size in fullscreen mode

even if viewport is same as window size. However, after exiting
fullscreen mode, the window size needs to be updated. 



git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4610 3789f03b-4d11-0410-bbf8-ca57d06f2519
tags/v1.1.90
Peter Åstrand vor 13 Jahren
Ursprung
Commit
1d03cbcc70
1 geänderte Dateien mit 6 neuen und 5 gelöschten Zeilen
  1. 6
    5
      vncviewer/DesktopWindow.cxx

+ 6
- 5
vncviewer/DesktopWindow.cxx Datei anzeigen

// If we're letting the viewport match the window perfectly, then // If we're letting the viewport match the window perfectly, then
// keep things that way for the new size, otherwise just keep things // keep things that way for the new size, otherwise just keep things
// like they are. // like they are.
#ifdef HAVE_FLTK_FULLSCREEN
if (!fullscreen_active()) {
#endif
if ((w() == viewport->w()) && (h() == viewport->h())) if ((w() == viewport->w()) && (h() == viewport->h()))
size(new_w, new_h); size(new_w, new_h);
else { else {
#ifdef HAVE_FLTK_FULLSCREEN
if (!fullscreen_active()) {
#endif
// Make sure the window isn't too big // Make sure the window isn't too big
if ((w() > new_w) || (h() > new_h)) if ((w() > new_w) || (h() > new_h))
size(__rfbmin(w(), new_w), __rfbmin(h(), new_h)); size(__rfbmin(w(), new_w), __rfbmin(h(), new_h));
}
#ifdef HAVE_FLTK_FULLSCREEN #ifdef HAVE_FLTK_FULLSCREEN
}
#endif
} }
#endif


viewport->size(new_w, new_h); viewport->size(new_w, new_h);


fullScreen.setParam(fullscreen_active()); fullScreen.setParam(fullscreen_active());
if (!fullscreen_active()) { if (!fullscreen_active()) {
size_range(100, 100, viewport->w(), viewport->h()); size_range(100, 100, viewport->w(), viewport->h());
size(viewport->w(), viewport->h());
} else { } else {
// We need to turn off the size limitations for proper // We need to turn off the size limitations for proper
// fullscreen support, but in case fullscreen is activated via // fullscreen support, but in case fullscreen is activated via

Laden…
Abbrechen
Speichern