all repos — fluxbox @ a6551852bb5cc860c2ba62b4b70ec269dcd9eb40

custom fork of the fluxbox windowmanager

fixed size_t issue with prevWorkspace, minor cosmetic changes to Screen.hh
mathias mathias
commit

a6551852bb5cc860c2ba62b4b70ec269dcd9eb40

parent

f1a6c9100b2b11ece591cf7d7f49eba7527a02f4

3 files changed, 9 insertions(+), 6 deletions(-)

jump to
M ChangeLogChangeLog

@@ -1,5 +1,8 @@

(Format: Year/Month/Day) Changes for 0.9.16: +*06/04/11: + * Fix calculation of prevWorkspace (Mathias) + Screen.cc *06/04/09: * Fix label background update with external tabs (Simon) FbWinFrame.cc
M src/Screen.ccsrc/Screen.cc

@@ -1913,7 +1913,7 @@ /**

Goes to the workspace "left" of the current */ void BScreen::prevWorkspace(const int delta) { - changeWorkspaceID( (currentWorkspaceID() - delta + numberOfWorkspaces()) % numberOfWorkspaces()); + changeWorkspaceID( (static_cast<signed>(numberOfWorkspaces()) + currentWorkspaceID() - (delta % numberOfWorkspaces())) % numberOfWorkspaces()); } /**
M src/Screen.hhsrc/Screen.hh

@@ -170,15 +170,15 @@ bool isKdeDockapp(Window win) const;

/// @return true if dock app was added, else false bool addKdeDockapp(Window win); - inline unsigned int width() const { return rootWindow().width(); } - inline unsigned int height() const { return rootWindow().height(); } - inline int screenNumber() const { return rootWindow().screenNumber(); } + unsigned int width() const { return rootWindow().width(); } + unsigned int height() const { return rootWindow().height(); } + int screenNumber() const { return rootWindow().screenNumber(); } /// @return number of workspaces size_t numberOfWorkspaces() const { return m_workspaces_list.size(); } - inline const Icons &iconList() const { return m_icon_list; } - inline Icons &iconList() { return m_icon_list; } + const Icons &iconList() const { return m_icon_list; } + Icons &iconList() { return m_icon_list; } const Workspaces &getWorkspacesList() const { return m_workspaces_list; } Workspaces &getWorkspacesList() { return m_workspaces_list; }