aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2006-04-11 18:26:00 (GMT)
committermathias <mathias>2006-04-11 18:26:00 (GMT)
commita6551852bb5cc860c2ba62b4b70ec269dcd9eb40 (patch)
tree08dcf3ca5fd07a1f9983abaffe10ed403f4f2199
parentf1a6c9100b2b11ece591cf7d7f49eba7527a02f4 (diff)
downloadfluxbox-a6551852bb5cc860c2ba62b4b70ec269dcd9eb40.zip
fluxbox-a6551852bb5cc860c2ba62b4b70ec269dcd9eb40.tar.bz2
fixed size_t issue with prevWorkspace, minor cosmetic changes to Screen.hh
-rw-r--r--ChangeLog3
-rw-r--r--src/Screen.cc2
-rw-r--r--src/Screen.hh10
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f62ee3..6238678 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/11:
4 * Fix calculation of prevWorkspace (Mathias)
5 Screen.cc
3*06/04/09: 6*06/04/09:
4 * Fix label background update with external tabs (Simon) 7 * Fix label background update with external tabs (Simon)
5 FbWinFrame.cc 8 FbWinFrame.cc
diff --git a/src/Screen.cc b/src/Screen.cc
index 4eae1b6..5dd5f9a 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1913,7 +1913,7 @@ void BScreen::nextWorkspace(const int delta) {
1913 Goes to the workspace "left" of the current 1913 Goes to the workspace "left" of the current
1914*/ 1914*/
1915void BScreen::prevWorkspace(const int delta) { 1915void BScreen::prevWorkspace(const int delta) {
1916 changeWorkspaceID( (currentWorkspaceID() - delta + numberOfWorkspaces()) % numberOfWorkspaces()); 1916 changeWorkspaceID( (static_cast<signed>(numberOfWorkspaces()) + currentWorkspaceID() - (delta % numberOfWorkspaces())) % numberOfWorkspaces());
1917} 1917}
1918 1918
1919/** 1919/**
diff --git a/src/Screen.hh b/src/Screen.hh
index 13f2fb9..ffac442 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -170,15 +170,15 @@ public:
170 /// @return true if dock app was added, else false 170 /// @return true if dock app was added, else false
171 bool addKdeDockapp(Window win); 171 bool addKdeDockapp(Window win);
172 172
173 inline unsigned int width() const { return rootWindow().width(); } 173 unsigned int width() const { return rootWindow().width(); }
174 inline unsigned int height() const { return rootWindow().height(); } 174 unsigned int height() const { return rootWindow().height(); }
175 inline int screenNumber() const { return rootWindow().screenNumber(); } 175 int screenNumber() const { return rootWindow().screenNumber(); }
176 176
177 /// @return number of workspaces 177 /// @return number of workspaces
178 size_t numberOfWorkspaces() const { return m_workspaces_list.size(); } 178 size_t numberOfWorkspaces() const { return m_workspaces_list.size(); }
179 179
180 inline const Icons &iconList() const { return m_icon_list; } 180 const Icons &iconList() const { return m_icon_list; }
181 inline Icons &iconList() { return m_icon_list; } 181 Icons &iconList() { return m_icon_list; }
182 182
183 const Workspaces &getWorkspacesList() const { return m_workspaces_list; } 183 const Workspaces &getWorkspacesList() const { return m_workspaces_list; }
184 Workspaces &getWorkspacesList() { return m_workspaces_list; } 184 Workspaces &getWorkspacesList() { return m_workspaces_list; }