Mercurial > hg > easyhg

changeset 572:88ec0ae91dcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update search in history only if there are search terms; don't use spacer in toolbar on Mac
author Chris Cannam
date Tue, 06 Mar 2012 14:24:48 +0000
parents e0d734fad735
children da2dd0e290ac
files src/historywidget.cpp src/mainwindow.cpp
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/historywidget.cpp	Wed Feb 29 15:24:10 2012 +0000
+++ b/src/historywidget.cpp	Tue Mar 06 14:24:48 2012 +0000
@@ -252,7 +252,9 @@
         toFocus->ensureVisible();
     }
 
-    updateSearchStatus();
+    if (m_searchText != "") {
+        updateSearchStatus();
+    }
     connectSceneSignals();
 }
 
--- a/src/mainwindow.cpp	Wed Feb 29 15:24:10 2012 +0000
+++ b/src/mainwindow.cpp	Tue Mar 06 14:24:48 2012 +0000
@@ -3061,9 +3061,13 @@
 
     m_repoToolBar = addToolBar(tr("Remote"));
     m_repoToolBar->setIconSize(QSize(sz, sz));
-    m_repoToolBar->addWidget(new QLabel(spacer));
+    if (spacingReqd) {
+        m_repoToolBar->addWidget(new QLabel(spacer));
+    }
     m_repoToolBar->addAction(m_openAct);
-    m_repoToolBar->addWidget(new QLabel(spacer));
+    if (spacingReqd) {
+        m_repoToolBar->addWidget(new QLabel(spacer));
+    }
     m_repoToolBar->addSeparator();
     m_repoToolBar->addAction(m_hgIncomingAct);
     m_repoToolBar->addAction(m_hgPullAct);