Improved adaptation to beamer resolution

texmacs · Apr 26, 2019 · cb1b6d5 · cb1b6d5
1 parent d1eb5e4
commit cb1b6d5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/TeXmacs/progs/texmacs/texmacs/tm-view.scm b/TeXmacs/progs/texmacs/texmacs/tm-view.scm
@@ -131,7 +131,7 @@
         (set! saved-informative-flags (get-init-env "info-flag"))
         (init-env "info-flag" "none")
         (full-screen-mode #t #f)
-        (fit-to-screen-width))))
+        (fit-to-screen))))
 
 (tm-define (toggle-full-screen-edit-mode)
   (:synopsis "Toggle full screen edit mode.")

diff --git a/src/Edit/Interface/edit_interface.cpp b/src/Edit/Interface/edit_interface.cpp
@@ -740,8 +740,7 @@ edit_interface_rep::apply_changes () {
     if (cur_sb && ey2 - ey1 > h) w -= scrollbar_width ();
     if (cur_sb && ex2 - ex1 > w) h -= scrollbar_width ();
     if (ex2 - ex1 <= w + 2*PIXEL) {
-      if (medium == "automatic" ||
-          (medium == "beamer" && full_screen))
+      if (medium == "automatic")
         ex2= ex1 + w;
       else {
 #ifdef X11TEXMACS
@@ -752,8 +751,7 @@ edit_interface_rep::apply_changes () {
       }
     }
     if (ey2 - ey1 <= h + 2*PIXEL) {
-      if (medium == "papyrus" || medium == "automatic" ||
-          (medium == "beamer" && full_screen))
+      if (medium == "papyrus" || medium == "automatic")
         ey1= ey2 - h;
       else {
 #ifdef X11TEXMACS

diff --git a/src/Plugins/Qt/qt_tm_widget.cpp b/src/Plugins/Qt/qt_tm_widget.cpp
@@ -900,6 +900,9 @@ qt_tm_widget_rep::set_full_screen(bool flag) {
   QWidget *win = mainwindow()->window();  
   if (win) {
     if (flag ) {
+      QPalette pal;
+      pal.setColor(QPalette::Mid, Qt::black);
+      mainwindow()->setPalette(pal);
 #ifdef UNIFIED_TOOLBAR
       if (use_unified_toolbar) {
         //HACK: we disable unified toolbar since otherwise
@@ -911,13 +914,16 @@ qt_tm_widget_rep::set_full_screen(bool flag) {
 #endif
 //      mainwindow()->window()->setContentsMargins(0,0,0,0);
       //win->showFullScreen();
-       win->setWindowState(win->windowState() ^ Qt::WindowFullScreen);
-    } else {
+       win->setWindowState(win->windowState() | Qt::WindowFullScreen);
+    }
+    else {
+      QPalette pal;
+      mainwindow()->setPalette(pal);
       bool cache = visibility[0];
       visibility[0] = false;
       update_visibility();
 //      win->showNormal();
-      win->setWindowState(win->windowState() ^ Qt::WindowFullScreen);
+      win->setWindowState(win->windowState() & ~Qt::WindowFullScreen);
 
       visibility[0] = cache;
       update_visibility();