Merge pull request #938 from contour-terminal/fix/revert-918

Reverting #918 to fix rendering glitch.

metainfo.xml

@@ -110,6 +110,7 @@
           <li>Fixes running within OpenGL/ES context.</li>
           <li>Fixes failing startup due to `background_image.path` pointing to a non-existing file (#928).</li>
           <li>Fixes terminfo entries `Se`, and adds missing entries `Rmol`, `Sync` (#936).</li>
+          <li>Fixes rendering glitches (reverting PR #918 until a better solution has been found).</li>
           <li>Adds config entry `indicator_statusline_inactive` colorscheme key to colorize the status line differently when the terminal is currently not in focus.</li>
         </ul>
       </description>

src/contour/display/TerminalWidget.cpp

@@ -528,18 +528,15 @@ void TerminalWidget::initializeGL()
 
 void TerminalWidget::resizeGL(int _width, int _height)
 {
-    Width const width =
-        profile().scrollbarPosition == config::ScrollBarPosition::Hidden
-            ? Width::cast_from(_width - qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent))
-            : Width::cast_from(_width);
-    QOpenGLWidget::resizeGL(width.as<int>(), _height);
+    QOpenGLWidget::resizeGL(_width, _height);
 
     if (!session_)
         return;
 
-    auto const qtBaseWidgetSize = terminal::ImageSize { width, Height::cast_from(_height) };
+    auto const qtBaseWidgetSize =
+        terminal::ImageSize { Width::cast_from(_width), Height::cast_from(_height) };
     auto const newPixelSize = qtBaseWidgetSize * contentScale();
-    DisplayLog()("Resizing view to {}x{} virtual ({} actual).", width, _height, newPixelSize);
+    DisplayLog()("Resizing view to {}x{} virtual ({} actual).", _width, _height, newPixelSize);
     applyResize(newPixelSize, *session_, *renderer_);
 }