]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/19.04'
authorNate Graham <nate@kde.org>
Mon, 20 May 2019 13:15:05 +0000 (07:15 -0600)
committerNate Graham <nate@kde.org>
Mon, 20 May 2019 13:15:05 +0000 (07:15 -0600)
1  2 
src/dolphintabwidget.cpp

diff --combined src/dolphintabwidget.cpp
index 3d03b3284334997b9336792c650447b787df6c4f,c677054d8907e274388fb184946b671a34a3f45a..e54ab5ada87cf0fb24082d6e10b6c55022840316
@@@ -19,6 -19,7 +19,7 @@@
  
  #include "dolphintabwidget.h"
  
+ #include "dolphin_generalsettings.h"
  #include "dolphintabbar.h"
  #include "dolphintabpage.h"
  #include "dolphinviewcontainer.h"
@@@ -37,13 -38,13 +38,13 @@@ DolphinTabWidget::DolphinTabWidget(QWid
      m_lastViewedTab(0)
  {
      connect(this, &DolphinTabWidget::tabCloseRequested,
 -            this, static_cast<void (DolphinTabWidget::*)(int)>(&DolphinTabWidget::closeTab));
 +            this, QOverload<int>::of(&DolphinTabWidget::closeTab));
      connect(this, &DolphinTabWidget::currentChanged,
              this, &DolphinTabWidget::currentTabChanged);
  
      DolphinTabBar* tabBar = new DolphinTabBar(this);
      connect(tabBar, &DolphinTabBar::openNewActivatedTab,
 -            this,  static_cast<void (DolphinTabWidget::*)(int)>(&DolphinTabWidget::openNewActivatedTab));
 +            this, QOverload<int>::of(&DolphinTabWidget::openNewActivatedTab));
      connect(tabBar, &DolphinTabBar::tabDropEvent,
              this, &DolphinTabWidget::tabDropEvent);
      connect(tabBar, &DolphinTabBar::tabDetachRequested,
@@@ -114,6 -115,14 +115,14 @@@ void DolphinTabWidget::readProperties(c
  
  void DolphinTabWidget::refreshViews()
  {
+     // Left-elision is better when showing full paths, since you care most
+     // about the current directory which is on the right
+     if (GeneralSettings::showFullPathInTitlebar()) {
+         setElideMode(Qt::ElideLeft);
+     } else {
+         setElideMode(Qt::ElideRight);
+     }
      const int tabCount = count();
      for (int i = 0; i < tabCount; ++i) {
          tabBar()->setTabText(i, tabName(tabPageAt(i)));