- XMoveResizeWindow(display, frame.window_label, (frame.bevel_w * 4) +
- (frame.button_w * 2) + frame.workspace_label_w + 3,
- frame.bevel_w, frame.window_label_w, frame.label_h);
- XMoveResizeWindow(display, frame.pwbutton, (frame.bevel_w * 5) +
- (frame.button_w * 2) + frame.workspace_label_w +
- frame.window_label_w + 4, frame.bevel_w + 1,
- frame.button_w, frame.button_w);
- XMoveResizeWindow(display, frame.nwbutton, (frame.bevel_w * 6) +
- (frame.button_w * 3) + frame.workspace_label_w +
- frame.window_label_w + 5, frame.bevel_w + 1,
- frame.button_w, frame.button_w);
- XMoveResizeWindow(display, frame.clock, frame.width - frame.clock_w -
- frame.bevel_w, frame.bevel_w, frame.clock_w,
- frame.label_h);
-
- Pixmap tmp = frame.base;
- BTexture *texture = &(screen.getToolbarStyle()->toolbar);
- if (texture->getTexture() == (BImage_Flat | BImage_Solid)) {
- frame.base = None;
+ XMoveResizeWindow(display, frame.nsbutton,
+ ((frame.bevel_w * 3) + frame.workspace_label_w +
+ frame.button_w + 2), frame.bevel_w + 1, frame.button_w,
+ frame.button_w);
+ XMoveResizeWindow(display, frame.window_label,
+ ((frame.bevel_w * 4) + (frame.button_w * 2) +
+ frame.workspace_label_w + 3), frame.bevel_w,
+ frame.window_label_w, frame.label_h);
+ XMoveResizeWindow(display, frame.pwbutton,
+ ((frame.bevel_w * 5) + (frame.button_w * 2) +
+ frame.workspace_label_w + frame.window_label_w + 4),
+ frame.bevel_w + 1, frame.button_w, frame.button_w);
+ XMoveResizeWindow(display, frame.nwbutton,
+ ((frame.bevel_w * 6) + (frame.button_w * 3) +
+ frame.workspace_label_w + frame.window_label_w + 5),
+ frame.bevel_w + 1, frame.button_w, frame.button_w);
+ XMoveResizeWindow(display, frame.clock,
+ frame.rect.width() - frame.clock_w - (frame.bevel_w * 2),
+ frame.bevel_w, frame.clock_w, frame.label_h);
+
+ ToolbarStyle *style = screen->getToolbarStyle();
+ frame.base = style->toolbar.render(frame.rect.width(), frame.rect.height(),
+ frame.base);
+ if (! frame.base)