aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--src/Tab.cc6
-rw-r--r--src/Toolbar.cc24
-rw-r--r--src/Toolbar.hh4
-rw-r--r--src/Window.cc24
-rw-r--r--src/fluxbox.cc26
6 files changed, 44 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog
index edaf2ca..c754e10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
1Changes for 0.1.6: 1Changes for 0.1.6:
2*02/01/06:
3 * Changed toolbar placement enums to uppercase letters (Claes Nästén)
2*02/01/05: 4*02/01/05:
3 * Changed placement/alignment enums to uppercase letters (Claes Nästén) 5 * Changed placement/alignment enums to uppercase letters (Claes Nästén)
4 * Fixed tab/iconbar resource bug (Claes Nästén) 6 * Fixed tab/iconbar resource bug (Claes Nästén)
diff --git a/src/Tab.cc b/src/Tab.cc
index 410d499..f7ab418 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -722,9 +722,9 @@ void Tab::motionNotifyEvent(XMotionEvent *me) {
722 int dtty, dbby, dty, dby; 722 int dtty, dbby, dty, dby;
723 723
724 switch (m_win->getScreen()->getToolbarPlacement()) { 724 switch (m_win->getScreen()->getToolbarPlacement()) {
725 case Toolbar::TopLeft: 725 case Toolbar::TOPLEFT:
726 case Toolbar::TopCenter: 726 case Toolbar::TOPCENTER:
727 case Toolbar::TopRight: 727 case Toolbar::TOPRIGHT:
728 dtty = m_win->getScreen()->getToolbar()->getExposedHeight() + 728 dtty = m_win->getScreen()->getToolbar()->getExposedHeight() +
729 m_win->getScreen()->getBorderWidth(); 729 m_win->getScreen()->getBorderWidth();
730 dbby = m_win->getScreen()->getHeight(); 730 dbby = m_win->getScreen()->getHeight();
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 6a6dcc8..6ad8327 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -227,7 +227,7 @@ void Toolbar::reconfigure(void) {
227 frame.height += (frame.bevel_w * 2); 227 frame.height += (frame.bevel_w * 2);
228 228
229 switch (screen->getToolbarPlacement()) { 229 switch (screen->getToolbarPlacement()) {
230 case TopLeft: 230 case TOPLEFT:
231 frame.x = 0; 231 frame.x = 0;
232 frame.y = 0; 232 frame.y = 0;
233 frame.x_hidden = 0; 233 frame.x_hidden = 0;
@@ -235,7 +235,7 @@ void Toolbar::reconfigure(void) {
235 - frame.height; 235 - frame.height;
236 break; 236 break;
237 237
238 case BottomLeft: 238 case BOTTOMLEFT:
239 frame.x = 0; 239 frame.x = 0;
240 frame.y = screen->getHeight() - frame.height - screen->getBorderWidth2x(); 240 frame.y = screen->getHeight() - frame.height - screen->getBorderWidth2x();
241 frame.x_hidden = 0; 241 frame.x_hidden = 0;
@@ -243,7 +243,7 @@ void Toolbar::reconfigure(void) {
243 - screen->getBorderWidth(); 243 - screen->getBorderWidth();
244 break; 244 break;
245 245
246 case TopCenter: 246 case TOPCENTER:
247 frame.x = (screen->getWidth() - frame.width) / 2; 247 frame.x = (screen->getWidth() - frame.width) / 2;
248 frame.y = 0; 248 frame.y = 0;
249 frame.x_hidden = frame.x; 249 frame.x_hidden = frame.x;
@@ -251,7 +251,7 @@ void Toolbar::reconfigure(void) {
251 - frame.height; 251 - frame.height;
252 break; 252 break;
253 253
254 case BottomCenter: 254 case BOTTOMCENTER:
255 default: 255 default:
256 frame.x = (screen->getWidth() - frame.width) / 2; 256 frame.x = (screen->getWidth() - frame.width) / 2;
257 frame.y = screen->getHeight() - frame.height - screen->getBorderWidth2x(); 257 frame.y = screen->getHeight() - frame.height - screen->getBorderWidth2x();
@@ -260,7 +260,7 @@ void Toolbar::reconfigure(void) {
260 - screen->getBorderWidth(); 260 - screen->getBorderWidth();
261 break; 261 break;
262 262
263 case TopRight: 263 case TOPRIGHT:
264 frame.x = screen->getWidth() - frame.width - screen->getBorderWidth2x(); 264 frame.x = screen->getWidth() - frame.width - screen->getBorderWidth2x();
265 frame.y = 0; 265 frame.y = 0;
266 frame.x_hidden = frame.x; 266 frame.x_hidden = frame.x;
@@ -268,7 +268,7 @@ void Toolbar::reconfigure(void) {
268 - frame.height; 268 - frame.height;
269 break; 269 break;
270 270
271 case BottomRight: 271 case BOTTOMRIGHT:
272 frame.x = screen->getWidth() - frame.width - screen->getBorderWidth2x(); 272 frame.x = screen->getWidth() - frame.width - screen->getBorderWidth2x();
273 frame.y = screen->getHeight() - frame.height - screen->getBorderWidth2x(); 273 frame.y = screen->getHeight() - frame.height - screen->getBorderWidth2x();
274 frame.x_hidden = frame.x; 274 frame.x_hidden = frame.x;
@@ -1349,7 +1349,7 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
1349 0, 0, 1349 0, 0,
1350#endif // NLS 1350#endif // NLS
1351 "Top Left"), 1351 "Top Left"),
1352 Toolbar::TopLeft); 1352 Toolbar::TOPLEFT);
1353 insert(i18n->getMessage( 1353 insert(i18n->getMessage(
1354#ifdef NLS 1354#ifdef NLS
1355 CommonSet, CommonPlacementBottomLeft, 1355 CommonSet, CommonPlacementBottomLeft,
@@ -1357,7 +1357,7 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
1357 0, 0, 1357 0, 0,
1358#endif // NLS 1358#endif // NLS
1359 "Bottom Left"), 1359 "Bottom Left"),
1360 Toolbar::BottomLeft); 1360 Toolbar::BOTTOMLEFT);
1361 insert(i18n->getMessage( 1361 insert(i18n->getMessage(
1362#ifdef NLS 1362#ifdef NLS
1363 CommonSet, CommonPlacementTopCenter, 1363 CommonSet, CommonPlacementTopCenter,
@@ -1365,7 +1365,7 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
1365 0, 0, 1365 0, 0,
1366#endif // NLS 1366#endif // NLS
1367 "Top Center"), 1367 "Top Center"),
1368 Toolbar::TopCenter); 1368 Toolbar::TOPCENTER);
1369 insert(i18n->getMessage( 1369 insert(i18n->getMessage(
1370#ifdef NLS 1370#ifdef NLS
1371 CommonSet, CommonPlacementBottomCenter, 1371 CommonSet, CommonPlacementBottomCenter,
@@ -1373,7 +1373,7 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
1373 0, 0, 1373 0, 0,
1374#endif // NLS 1374#endif // NLS
1375 "Bottom Center"), 1375 "Bottom Center"),
1376 Toolbar::BottomCenter); 1376 Toolbar::BOTTOMCENTER);
1377 insert(i18n->getMessage( 1377 insert(i18n->getMessage(
1378#ifdef NLS 1378#ifdef NLS
1379 CommonSet, CommonPlacementTopRight, 1379 CommonSet, CommonPlacementTopRight,
@@ -1381,7 +1381,7 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
1381 0, 0, 1381 0, 0,
1382#endif // NLS 1382#endif // NLS
1383 "Top Right"), 1383 "Top Right"),
1384 Toolbar::TopRight); 1384 Toolbar::TOPRIGHT);
1385 insert(i18n->getMessage( 1385 insert(i18n->getMessage(
1386#ifdef NLS 1386#ifdef NLS
1387 CommonSet, CommonPlacementBottomRight, 1387 CommonSet, CommonPlacementBottomRight,
@@ -1389,7 +1389,7 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu *tm)
1389 0, 0, 1389 0, 0,
1390#endif // NLS 1390#endif // NLS
1391 "Bottom Right"), 1391 "Bottom Right"),
1392 Toolbar::BottomRight); 1392 Toolbar::BOTTOMRIGHT);
1393 1393
1394 update(); 1394 update();
1395} 1395}
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index a0aa440..bd59a8c 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -156,8 +156,8 @@ public:
156 156
157 virtual void timeout(void); 157 virtual void timeout(void);
158 158
159 enum { TopLeft = 1, BottomLeft, TopCenter, 159 enum { TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
160 BottomCenter, TopRight, BottomRight }; 160 BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
161}; 161};
162 162
163 163
diff --git a/src/Window.cc b/src/Window.cc
index 834c555..7275ba3 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1847,9 +1847,9 @@ void FluxboxWindow::maximize(unsigned int button) {
1847 case Slit::TopRight: 1847 case Slit::TopRight:
1848 slitModT = mSlt->getHeight() + screen->getBevelWidth(); 1848 slitModT = mSlt->getHeight() + screen->getBevelWidth();
1849 switch (screen->getToolbarPlacement()) { 1849 switch (screen->getToolbarPlacement()) {
1850 case Toolbar::TopLeft: 1850 case Toolbar::TOPLEFT:
1851 case Toolbar::TopCenter: 1851 case Toolbar::TOPCENTER:
1852 case Toolbar::TopRight: 1852 case Toolbar::TOPRIGHT:
1853 slitModT -= screen->getToolbar()->getExposedHeight() + screen->getBorderWidth(); 1853 slitModT -= screen->getToolbar()->getExposedHeight() + screen->getBorderWidth();
1854 break; 1854 break;
1855 } 1855 }
@@ -1857,9 +1857,9 @@ void FluxboxWindow::maximize(unsigned int button) {
1857 default: 1857 default:
1858 slitModB = mSlt->getHeight() + screen->getBevelWidth(); 1858 slitModB = mSlt->getHeight() + screen->getBevelWidth();
1859 switch (screen->getToolbarPlacement()) { 1859 switch (screen->getToolbarPlacement()) {
1860 case Toolbar::BottomLeft: 1860 case Toolbar::BOTTOMLEFT:
1861 case Toolbar::BottomCenter: 1861 case Toolbar::BOTTOMCENTER:
1862 case Toolbar::BottomRight: 1862 case Toolbar::BOTTOMRIGHT:
1863 slitModB -= screen->getToolbar()->getExposedHeight() + screen->getBorderWidth(); 1863 slitModB -= screen->getToolbar()->getExposedHeight() + screen->getBorderWidth();
1864 break; 1864 break;
1865 } 1865 }
@@ -1916,9 +1916,9 @@ void FluxboxWindow::maximize(unsigned int button) {
1916 - dh) / 2) - screen->getBorderWidth2x(); 1916 - dh) / 2) - screen->getBorderWidth2x();
1917 1917
1918 switch (screen->getToolbarPlacement()) { 1918 switch (screen->getToolbarPlacement()) {
1919 case Toolbar::TopLeft: 1919 case Toolbar::TOPLEFT:
1920 case Toolbar::TopCenter: 1920 case Toolbar::TOPCENTER:
1921 case Toolbar::TopRight: 1921 case Toolbar::TOPRIGHT:
1922 dy += screen->getToolbar()->getExposedHeight() + 1922 dy += screen->getToolbar()->getExposedHeight() +
1923 screen->getBorderWidth2x(); 1923 screen->getBorderWidth2x();
1924 break; 1924 break;
@@ -3009,9 +3009,9 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) {
3009 3009
3010 int dtty, dbby, dty, dby; 3010 int dtty, dbby, dty, dby;
3011 switch (screen->getToolbarPlacement()) { 3011 switch (screen->getToolbarPlacement()) {
3012 case Toolbar::TopLeft: 3012 case Toolbar::TOPLEFT:
3013 case Toolbar::TopCenter: 3013 case Toolbar::TOPCENTER:
3014 case Toolbar::TopRight: 3014 case Toolbar::TOPRIGHT:
3015 dtty = screen->getToolbar()->getExposedHeight() + 3015 dtty = screen->getToolbar()->getExposedHeight() +
3016 screen->getBorderWidth(); 3016 screen->getBorderWidth();
3017 dbby = screen->getHeight(); 3017 dbby = screen->getHeight();
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 4394fbc..f9c3b6d 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1584,12 +1584,12 @@ void Fluxbox::save_rc(void) {
1584 char *toolbar_placement = (char *) 0; 1584 char *toolbar_placement = (char *) 0;
1585 1585
1586 switch (screen->getToolbarPlacement()) { 1586 switch (screen->getToolbarPlacement()) {
1587 case Toolbar::TopLeft: toolbar_placement = "TopLeft"; break; 1587 case Toolbar::TOPLEFT: toolbar_placement = "TopLeft"; break;
1588 case Toolbar::BottomLeft: toolbar_placement = "BottomLeft"; break; 1588 case Toolbar::BOTTOMLEFT: toolbar_placement = "BottomLeft"; break;
1589 case Toolbar::TopCenter: toolbar_placement = "TopCenter"; break; 1589 case Toolbar::TOPCENTER: toolbar_placement = "TopCenter"; break;
1590 case Toolbar::TopRight: toolbar_placement = "TopRight"; break; 1590 case Toolbar::TOPRIGHT: toolbar_placement = "TopRight"; break;
1591 case Toolbar::BottomRight: toolbar_placement = "BottomRight"; break; 1591 case Toolbar::BOTTOMRIGHT: toolbar_placement = "BottomRight"; break;
1592 case Toolbar::BottomCenter: default: 1592 case Toolbar::BOTTOMCENTER: default:
1593 toolbar_placement = "BottomCenter"; break; 1593 toolbar_placement = "BottomCenter"; break;
1594 } 1594 }
1595 1595
@@ -2038,19 +2038,19 @@ void Fluxbox::load_rc(BScreen *screen) {
2038 if (XrmGetResource(database, name_lookup, class_lookup, &value_type, 2038 if (XrmGetResource(database, name_lookup, class_lookup, &value_type,
2039 &value)) { 2039 &value)) {
2040 if (! strncasecmp(value.addr, "TopLeft", value.size)) 2040 if (! strncasecmp(value.addr, "TopLeft", value.size))
2041 screen->saveToolbarPlacement(Toolbar::TopLeft); 2041 screen->saveToolbarPlacement(Toolbar::TOPLEFT);
2042 else if (! strncasecmp(value.addr, "BottomLeft", value.size)) 2042 else if (! strncasecmp(value.addr, "BottomLeft", value.size))
2043 screen->saveToolbarPlacement(Toolbar::BottomLeft); 2043 screen->saveToolbarPlacement(Toolbar::BOTTOMLEFT);
2044 else if (! strncasecmp(value.addr, "TopCenter", value.size)) 2044 else if (! strncasecmp(value.addr, "TopCenter", value.size))
2045 screen->saveToolbarPlacement(Toolbar::TopCenter); 2045 screen->saveToolbarPlacement(Toolbar::TOPCENTER);
2046 else if (! strncasecmp(value.addr, "TopRight", value.size)) 2046 else if (! strncasecmp(value.addr, "TopRight", value.size))
2047 screen->saveToolbarPlacement(Toolbar::TopRight); 2047 screen->saveToolbarPlacement(Toolbar::TOPRIGHT);
2048 else if (! strncasecmp(value.addr, "BottomRight", value.size)) 2048 else if (! strncasecmp(value.addr, "BottomRight", value.size))
2049 screen->saveToolbarPlacement(Toolbar::BottomRight); 2049 screen->saveToolbarPlacement(Toolbar::BOTTOMRIGHT);
2050 else 2050 else
2051 screen->saveToolbarPlacement(Toolbar::BottomCenter); 2051 screen->saveToolbarPlacement(Toolbar::BOTTOMCENTER);
2052 } else 2052 } else
2053 screen->saveToolbarPlacement(Toolbar::BottomCenter); 2053 screen->saveToolbarPlacement(Toolbar::BOTTOMCENTER);
2054 2054
2055 screen->removeWorkspaceNames(); 2055 screen->removeWorkspaceNames();
2056 2056
generated by cgit v0.11.2 at 2024-06-26 18:18:59 (GMT)