Merge pull request #918 from contour-terminal/fix/column_number

Fix/column number
contour-terminal · Dec 17, 2022 · a7bb938 · a7bb938
2 parents c2ee1a1 + 06c7770
commit a7bb938
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/contour/display/TerminalWidget.cpp b/src/contour/display/TerminalWidget.cpp
@@ -528,15 +528,18 @@ void TerminalWidget::initializeGL()
 
 void TerminalWidget::resizeGL(int _width, int _height)
 {
-    QOpenGLWidget::resizeGL(_width, _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);
 
     if (!session_)
         return;
 
-    auto const qtBaseWidgetSize =
-        terminal::ImageSize { Width::cast_from(_width), Height::cast_from(_height) };
+    auto const qtBaseWidgetSize = terminal::ImageSize { 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_);
 }