aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-07-02 05:26:32 (GMT)
committermarkt <markt>2007-07-02 05:26:32 (GMT)
commit562fa2642354fb2bb7281fc70b777b3e22662df6 (patch)
tree6ab5dc9b178eeb41b36bd7773c89c3e8ba1e8e1e
parent5fcb520bbb891683a8321cebe4d9fbe9d88e5709 (diff)
downloadfluxbox_pavel-562fa2642354fb2bb7281fc70b777b3e22662df6.zip
fluxbox_pavel-562fa2642354fb2bb7281fc70b777b3e22662df6.tar.bz2
minor usability fix for :Tab command and fixed handle rendering when switching from a style without them
-rw-r--r--ChangeLog6
-rw-r--r--src/CurrentWindowCmd.cc7
-rw-r--r--src/FbWinFrame.cc5
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 71ac769..4c5b440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/07/02: 3*07/07/02:
4 * Fixed handle rendering when switching from a style without them (Mark)
5 FbWinFrame.cc
6 * Changed :Tab <int> key command so that the last tab is focused if <int> is
7 larger than the number of tabs (or first if <int> is negative and |<int>|
8 is too large) (Mark)
9 CurrentWindowCmd.cc
4 * Fixed some rendering problems when toolbar item borderwidth is too large 10 * Fixed some rendering problems when toolbar item borderwidth is too large
5 and toolbar bevelwidth is set (Mark) 11 and toolbar bevelwidth is set (Mark)
6 Toolbar.cc 12 Toolbar.cc
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index fcc141b..b6c3c0e 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -85,9 +85,10 @@ void TakeToPrevWorkspaceCmd::real_execute() {
85} 85}
86 86
87void GoToTabCmd::real_execute() { 87void GoToTabCmd::real_execute() {
88 int num = m_tab_num + (m_tab_num > 0 ? 0 : fbwindow().numClients() + 1); 88 int num = m_tab_num;
89 if (num < 1 || num > fbwindow().numClients()) 89 if (num < 0) num += fbwindow().numClients() + 1;
90 return; 90 if (num < 1) num = 1;
91 if (num > fbwindow().numClients()) num = fbwindow().numClients();
91 92
92 FluxboxWindow::ClientList::iterator it = fbwindow().clientList().begin(); 93 FluxboxWindow::ClientList::iterator it = fbwindow().clientList().begin();
93 94
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index adef30c..5a9a301 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -833,10 +833,11 @@ bool FbWinFrame::showHandle() {
833 if (m_use_handle || theme().handleWidth() == 0) 833 if (m_use_handle || theme().handleWidth() == 0)
834 return false; 834 return false;
835 835
836 m_use_handle = true;
837
836 // weren't previously rendered... 838 // weren't previously rendered...
837 renderHandles(); 839 renderHandles();
838 840 applyHandles();
839 m_use_handle = true;
840 841
841 m_handle.show(); 842 m_handle.show();
842 m_handle.showSubwindows(); // shows grips 843 m_handle.showSubwindows(); // shows grips