aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-08 22:36:30 (GMT)
committerfluxgen <fluxgen>2002-04-08 22:36:30 (GMT)
commit02253281ee96b0b68a3369d4a02bd90a216c9c58 (patch)
tree081aa5a95190c2feb78b0dae9cfb6ecdfa298e5f /src/Toolbar.cc
parent1b64d4cfac125491bfebbfc598608b55bef5ca36 (diff)
downloadfluxbox_pavel-02253281ee96b0b68a3369d4a02bd90a216c9c58.zip
fluxbox_pavel-02253281ee96b0b68a3369d4a02bd90a216c9c58.tar.bz2
updated to match BaseMenu
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 546d970..389b6db 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
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.19 2002/04/04 11:28:19 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.20 2002/04/08 22:30:51 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -1035,18 +1035,18 @@ void Toolbar::buttonPressEvent(XButtonEvent *be) {
1035 if (! toolbarmenu->isVisible()) { 1035 if (! toolbarmenu->isVisible()) {
1036 int x, y; 1036 int x, y;
1037 1037
1038 x = be->x_root - (toolbarmenu->getWidth() / 2); 1038 x = be->x_root - (toolbarmenu->width() / 2);
1039 y = be->y_root - (toolbarmenu->getHeight() / 2); 1039 y = be->y_root - (toolbarmenu->height() / 2);
1040 1040
1041 if (x < 0) 1041 if (x < 0)
1042 x = 0; 1042 x = 0;
1043 else if (x + toolbarmenu->getWidth() > screen->getWidth()) 1043 else if (x + toolbarmenu->width() > screen->getWidth())
1044 x = screen->getWidth() - toolbarmenu->getWidth(); 1044 x = screen->getWidth() - toolbarmenu->width();
1045 1045
1046 if (y < 0) 1046 if (y < 0)
1047 y = 0; 1047 y = 0;
1048 else if (y + toolbarmenu->getHeight() > screen->getHeight()) 1048 else if (y + toolbarmenu->height() > screen->getHeight())
1049 y = screen->getHeight() - toolbarmenu->getHeight(); 1049 y = screen->getHeight() - toolbarmenu->height();
1050 1050
1051 toolbarmenu->move(x, y); 1051 toolbarmenu->move(x, y);
1052 toolbarmenu->show(); 1052 toolbarmenu->show();