aboutsummaryrefslogtreecommitdiff
path: root/src/Window.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/Window.cc
parent1b64d4cfac125491bfebbfc598608b55bef5ca36 (diff)
downloadfluxbox_pavel-02253281ee96b0b68a3369d4a02bd90a216c9c58.zip
fluxbox_pavel-02253281ee96b0b68a3369d4a02bd90a216c9c58.tar.bz2
updated to match BaseMenu
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 3b0afd8..80edb86 100644
--- a/src/Window.cc
+++ b/src/Window.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: Window.cc,v 1.40 2002/04/04 22:39:52 fluxgen Exp $ 25// $Id: Window.cc,v 1.41 2002/04/08 22:32:07 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -1377,7 +1377,7 @@ void FluxboxWindow::reconfigure(void) {
1377 XUngrabButton(display, Button1, AnyModifier, frame.plate); 1377 XUngrabButton(display, Button1, AnyModifier, frame.plate);
1378 1378
1379 if (windowmenu) { 1379 if (windowmenu) {
1380 windowmenu->move(windowmenu->getX(), frame.y + frame.title_h); 1380 windowmenu->move(windowmenu->x(), frame.y + frame.title_h);
1381 windowmenu->reconfigure(); 1381 windowmenu->reconfigure();
1382 } 1382 }
1383 1383
@@ -3192,30 +3192,30 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent *be) {
3192 int mx = 0, my = 0; 3192 int mx = 0, my = 0;
3193 3193
3194 if (frame.title == be->window || frame.label == be->window) { 3194 if (frame.title == be->window || frame.label == be->window) {
3195 mx = be->x_root - (windowmenu->getWidth() / 2); 3195 mx = be->x_root - (windowmenu->width() / 2);
3196 my = frame.y + frame.title_h; 3196 my = frame.y + frame.title_h;
3197 } else if (frame.handle == be->window) { 3197 } else if (frame.handle == be->window) {
3198 mx = be->x_root - (windowmenu->getWidth() / 2); 3198 mx = be->x_root - (windowmenu->width() / 2);
3199 my = frame.y + frame.y_handle - windowmenu->getHeight(); 3199 my = frame.y + frame.y_handle - windowmenu->height();
3200 } else { 3200 } else {
3201 bool buttonproc=false; 3201 bool buttonproc=false;
3202 3202
3203 if (buttonproc) 3203 if (buttonproc)
3204 mx = be->x_root - (windowmenu->getWidth() / 2); 3204 mx = be->x_root - (windowmenu->width() / 2);
3205 3205
3206 if (be->y <= (signed) frame.bevel_w) 3206 if (be->y <= (signed) frame.bevel_w)
3207 my = frame.y + frame.y_border; 3207 my = frame.y + frame.y_border;
3208 else 3208 else
3209 my = be->y_root - (windowmenu->getHeight() / 2); 3209 my = be->y_root - (windowmenu->height() / 2);
3210 } 3210 }
3211 3211
3212 if (mx > (signed) (frame.x + frame.width - windowmenu->getWidth())) 3212 if (mx > (signed) (frame.x + frame.width - windowmenu->width()))
3213 mx = frame.x + frame.width - windowmenu->getWidth(); 3213 mx = frame.x + frame.width - windowmenu->width();
3214 if (mx < frame.x) 3214 if (mx < frame.x)
3215 mx = frame.x; 3215 mx = frame.x;
3216 3216
3217 if (my > (signed) (frame.y + frame.y_handle - windowmenu->getHeight())) 3217 if (my > (signed) (frame.y + frame.y_handle - windowmenu->height()))
3218 my = frame.y + frame.y_handle - windowmenu->getHeight(); 3218 my = frame.y + frame.y_handle - windowmenu->height();
3219 if (my < (signed) (frame.y + ((decorations.titlebar) ? frame.title_h : 3219 if (my < (signed) (frame.y + ((decorations.titlebar) ? frame.title_h :
3220 frame.y_border))) 3220 frame.y_border)))
3221 my = frame.y + 3221 my = frame.y +
@@ -3225,9 +3225,9 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent *be) {
3225 if (! windowmenu->isVisible()) { // if not window menu is visible then show it 3225 if (! windowmenu->isVisible()) { // if not window menu is visible then show it
3226 windowmenu->move(mx, my); 3226 windowmenu->move(mx, my);
3227 windowmenu->show(); 3227 windowmenu->show();
3228 XRaiseWindow(display, windowmenu->getWindowID()); 3228 XRaiseWindow(display, windowmenu->windowID());
3229 XRaiseWindow(display, windowmenu->getSendToMenu()->getWindowID()); 3229 XRaiseWindow(display, windowmenu->getSendToMenu()->windowID());
3230 XRaiseWindow(display, windowmenu->getSendGroupToMenu()->getWindowID()); 3230 XRaiseWindow(display, windowmenu->getSendGroupToMenu()->windowID());
3231 } else //else hide menu 3231 } else //else hide menu
3232 windowmenu->hide(); 3232 windowmenu->hide();
3233 } 3233 }