diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2011-03-01 13:32:21 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2011-03-01 13:32:21 (GMT) |
commit | bb2ce5df8a814f9b858b6919356f7d37f10e6b9f (patch) | |
tree | 6d82f03ab0477e01f17f3c7495a9279a9a3a6aba | |
parent | cd74184e5033fb9a820b27f1743318fd38d7626e (diff) | |
download | fluxbox_pavel-bb2ce5df8a814f9b858b6919356f7d37f10e6b9f.zip fluxbox_pavel-bb2ce5df8a814f9b858b6919356f7d37f10e6b9f.tar.bz2 |
fix misordered Toolbar::Placement strings, closes 3195721
-rw-r--r-- | src/Toolbar.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc index cb1a956..1e43b5c 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc | |||
@@ -101,8 +101,8 @@ const ToolbarPlacementString placement_strings[] = { | |||
101 | { Toolbar::LEFTBOTTOM, "LeftBottom" }, | 101 | { Toolbar::LEFTBOTTOM, "LeftBottom" }, |
102 | { Toolbar::LEFTCENTER, "LeftCenter" }, | 102 | { Toolbar::LEFTCENTER, "LeftCenter" }, |
103 | { Toolbar::LEFTTOP, "LeftTop" }, | 103 | { Toolbar::LEFTTOP, "LeftTop" }, |
104 | { Toolbar::RIGHTCENTER, "RightCenter" }, | ||
105 | { Toolbar::RIGHTBOTTOM, "RightBottom" }, | 104 | { Toolbar::RIGHTBOTTOM, "RightBottom" }, |
105 | { Toolbar::RIGHTCENTER, "RightCenter" }, | ||
106 | { Toolbar::RIGHTTOP, "RightTop" } | 106 | { Toolbar::RIGHTTOP, "RightTop" } |
107 | }; | 107 | }; |
108 | 108 | ||
@@ -115,8 +115,8 @@ string FbTk::Resource<Toolbar::Placement>:: | |||
115 | getString() const { | 115 | getString() const { |
116 | 116 | ||
117 | size_t i = (m_value == FbTk::Util::clamp(m_value, Toolbar::TOPLEFT, Toolbar::RIGHTTOP) | 117 | size_t i = (m_value == FbTk::Util::clamp(m_value, Toolbar::TOPLEFT, Toolbar::RIGHTTOP) |
118 | ? m_value | 118 | ? m_value |
119 | : Toolbar::DEFAULT) - 1; | 119 | : Toolbar::DEFAULT) - Toolbar::TOPLEFT; |
120 | return placement_strings[i].str; | 120 | return placement_strings[i].str; |
121 | } | 121 | } |
122 | 122 | ||