Fix bug with tab switching and implement wrapping of tabs on left/rig…

…ht switches
contour-terminal · Dec 18, 2024 · ebddfba · ebddfba
1 parent 46f74e9
commit ebddfba
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/src/contour/TerminalSessionManager.cpp b/src/contour/TerminalSessionManager.cpp
@@ -106,16 +106,9 @@ void TerminalSessionManager::switchToTabLeft()
     {
         setSession(currentSessionIndex - 1);
     }
-}
-
-void TerminalSessionManager::switchToTab(int position)
-{
-    managerLog()(std::format(
-        "switchToTab from {} to {} (out of {})", getCurrentSessionIndex(), position - 1, _sessions.size()));
-
-    if (1 <= position && position <= static_cast<int>(_sessions.size()))
+    else // wrap
     {
-        setSession(position - 1);
+        setSession(_sessions.size() - 1);
     }
 }
 
@@ -129,6 +122,21 @@ void TerminalSessionManager::switchToTabRight()
     {
         setSession(currentSessionIndex + 1);
     }
+    else // wrap
+    {
+        setSession(0);
+    }
+}
+
+void TerminalSessionManager::switchToTab(int position)
+{
+    managerLog()(std::format(
+        "switchToTab from {} to {} (out of {})", getCurrentSessionIndex(), position - 1, _sessions.size()));
+
+    if (1 <= position && position <= static_cast<int>(_sessions.size()))
+    {
+        setSession(position - 1);
+    }
 }
 
 void TerminalSessionManager::closeTab()

diff --git a/src/contour/display/TerminalDisplay.cpp b/src/contour/display/TerminalDisplay.cpp
@@ -311,6 +311,8 @@ void TerminalDisplay::setSession(TerminalSession* newSession)
     window()->setFlag(Qt::FramelessWindowHint, !profile().showTitleBar.value());
 
     if (!_renderer)
+    {
+
         _renderer = make_unique<vtrasterizer::Renderer>(
             _session->profile().terminalSize.value(),
             sanitizeFontDescription(profile().fonts.value(), fontDPI()),
@@ -323,9 +325,11 @@ void TerminalDisplay::setSession(TerminalSession* newSession)
             // TODO: , WindowMargin(windowMargin_.left, windowMargin_.bottom);
         );
 
-    applyFontDPI();
-    updateImplicitSize();
-    updateMinimumSize();
+        // setup once with the renderer creation
+        applyFontDPI();
+        updateImplicitSize();
+        updateMinimumSize();
+    }
 
     _session->attachDisplay(*this); // NB: Requires Renderer to be instanciated to retrieve grid metrics.
 

diff --git a/src/contour/helper.cpp b/src/contour/helper.cpp
@@ -607,8 +607,8 @@ void applyResize(vtbackend::ImageSize newPixelSize,
                  TerminalSession& session,
                  vtrasterizer::Renderer& renderer)
 {
-    if (*newPixelSize.width == 0 || *newPixelSize.height == 0)
-        return;
+    if (*newPixelSize.width == 0
+                                                      || *newPixelSize.height == 0) return;
 
     auto const oldPageSize = session.terminal().pageSize();
     auto const newPageSize = pageSizeForPixels(