diff options
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r-- | src/Toolbar.cc | 24 |
1 files changed, 12 insertions, 12 deletions
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 | } |