aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Toolbar.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index efa09a7..8e72f0f 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,15 +22,13 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.52 2003/01/07 02:07:43 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.53 2003/01/09 18:42:32 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
29#include "i18n.hh" 29#include "i18n.hh"
30#include "fluxbox.hh" 30#include "fluxbox.hh"
31#include "Clientmenu.hh" 31#include "Clientmenu.hh"
32#include "Iconmenu.hh"
33#include "Rootmenu.hh"
34#include "Screen.hh" 32#include "Screen.hh"
35#include "Window.hh" 33#include "Window.hh"
36#include "Workspace.hh" 34#include "Workspace.hh"
@@ -68,6 +66,10 @@
68#endif // HAVE_SYS_TIME_H 66#endif // HAVE_SYS_TIME_H
69#endif // TIME_WITH_SYS_TIME 67#endif // TIME_WITH_SYS_TIME
70 68
69#ifdef SHAPE
70#include <X11/extensions/shape.h>
71#endif // SHAPE
72
71#include <iostream> 73#include <iostream>
72 74
73using namespace std; 75using namespace std;
@@ -197,7 +199,7 @@ Toolbar::Toolbar(BScreen *scrn, size_t width):
197 199
198 200
199Toolbar::~Toolbar() { 201Toolbar::~Toolbar() {
200 202
201 if (frame.base) image_ctrl.removeImage(frame.base); 203 if (frame.base) image_ctrl.removeImage(frame.base);
202 if (frame.label) image_ctrl.removeImage(frame.label); 204 if (frame.label) image_ctrl.removeImage(frame.label);
203 if (frame.wlabel) image_ctrl.removeImage(frame.wlabel); 205 if (frame.wlabel) image_ctrl.removeImage(frame.wlabel);
@@ -502,7 +504,6 @@ void Toolbar::reconfigure() {
502 504
503 m_iconbar.reset(0); // destroy iconbar 505 m_iconbar.reset(0); // destroy iconbar
504 } 506 }
505
506} 507}
507 508
508 509
@@ -756,7 +757,7 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
756void Toolbar::buttonReleaseEvent(XButtonEvent &re) { 757void Toolbar::buttonReleaseEvent(XButtonEvent &re) {
757 if (re.button == 1) { 758 if (re.button == 1) {
758 if (re.window == frame.workspace_label) { 759 if (re.window == frame.workspace_label) {
759 Basemenu *menu = screen()->getWorkspacemenu(); 760 FbTk::Menu *menu = screen()->getWorkspacemenu();
760 //move the workspace label and make it visible 761 //move the workspace label and make it visible
761 menu->move(re.x_root, re.y_root); 762 menu->move(re.x_root, re.y_root);
762 // make sure the entire menu is visible (TODO: this is repeated by other menus, make a function!) 763 // make sure the entire menu is visible (TODO: this is repeated by other menus, make a function!)
@@ -983,8 +984,6 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
983 frame.x = head_x + head_w - frame.width - screen()->getBorderWidth2x(); 984 frame.x = head_x + head_w - frame.width - screen()->getBorderWidth2x();
984 frame.y = head_y; 985 frame.y = head_y;
985 frame.x_hidden = frame.x; 986 frame.x_hidden = frame.x;
986 frame.y_hidden = head_y +
987 screen()->getBevelWidth() - screen()->getBorderWidth() - frame.height;
988 break; 987 break;
989 988
990 case BOTTOMRIGHT: 989 case BOTTOMRIGHT: