diff options
| author | fluxgen <fluxgen> | 2002-04-08 22:36:30 (GMT) |
|---|---|---|
| committer | fluxgen <fluxgen> | 2002-04-08 22:36:30 (GMT) |
| commit | 02253281ee96b0b68a3369d4a02bd90a216c9c58 (patch) | |
| tree | 081aa5a95190c2feb78b0dae9cfb6ecdfa298e5f /src/fluxbox.cc | |
| parent | 1b64d4cfac125491bfebbfc598608b55bef5ca36 (diff) | |
| download | fluxbox-02253281ee96b0b68a3369d4a02bd90a216c9c58.zip fluxbox-02253281ee96b0b68a3369d4a02bd90a216c9c58.tar.bz2 | |
updated to match BaseMenu
Diffstat (limited to 'src/fluxbox.cc')
| -rw-r--r-- | src/fluxbox.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index c2f53e2..3d7cc2d 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.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: fluxbox.cc,v 1.45 2002/04/04 14:23:54 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.46 2002/04/08 22:36:30 fluxgen Exp $ |
| 26 | 26 | ||
| 27 | //Use some GNU extensions | 27 | //Use some GNU extensions |
| 28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
| @@ -946,24 +946,24 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) { | |||
| 946 | 946 | ||
| 947 | } else if (be.button == 2) { | 947 | } else if (be.button == 2) { |
| 948 | int mx = be.x_root - | 948 | int mx = be.x_root - |
| 949 | (screen->getWorkspacemenu()->getWidth() / 2); | 949 | (screen->getWorkspacemenu()->width() / 2); |
| 950 | int my = be.y_root - | 950 | int my = be.y_root - |
| 951 | (screen->getWorkspacemenu()->getTitleHeight() / 2); | 951 | (screen->getWorkspacemenu()->titleHeight() / 2); |
| 952 | 952 | ||
| 953 | if (mx < 0) mx = 0; | 953 | if (mx < 0) mx = 0; |
| 954 | if (my < 0) my = 0; | 954 | if (my < 0) my = 0; |
| 955 | 955 | ||
| 956 | if (mx + screen->getWorkspacemenu()->getWidth() > | 956 | if (mx + screen->getWorkspacemenu()->width() > |
| 957 | screen->getWidth()) { | 957 | screen->getWidth()) { |
| 958 | mx = screen->getWidth() - | 958 | mx = screen->getWidth() - |
| 959 | screen->getWorkspacemenu()->getWidth() - | 959 | screen->getWorkspacemenu()->width() - |
| 960 | screen->getBorderWidth(); | 960 | screen->getBorderWidth(); |
| 961 | } | 961 | } |
| 962 | 962 | ||
| 963 | if (my + screen->getWorkspacemenu()->getHeight() > | 963 | if (my + screen->getWorkspacemenu()->height() > |
| 964 | screen->getHeight()) { | 964 | screen->getHeight()) { |
| 965 | my = screen->getHeight() - | 965 | my = screen->getHeight() - |
| 966 | screen->getWorkspacemenu()->getHeight() - | 966 | screen->getWorkspacemenu()->height() - |
| 967 | screen->getBorderWidth(); | 967 | screen->getBorderWidth(); |
| 968 | } | 968 | } |
| 969 | screen->getWorkspacemenu()->move(mx, my); | 969 | screen->getWorkspacemenu()->move(mx, my); |
| @@ -976,23 +976,23 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) { | |||
| 976 | //calculate placement of workspace menu | 976 | //calculate placement of workspace menu |
| 977 | //and show/hide it | 977 | //and show/hide it |
| 978 | int mx = be.x_root - | 978 | int mx = be.x_root - |
| 979 | (screen->getRootmenu()->getWidth() / 2); | 979 | (screen->getRootmenu()->width() / 2); |
| 980 | int my = be.y_root - | 980 | int my = be.y_root - |
| 981 | (screen->getRootmenu()->getTitleHeight() / 2); | 981 | (screen->getRootmenu()->titleHeight() / 2); |
| 982 | 982 | ||
| 983 | if (mx < 0) mx = 0; | 983 | if (mx < 0) mx = 0; |
| 984 | if (my < 0) my = 0; | 984 | if (my < 0) my = 0; |
| 985 | 985 | ||
| 986 | if (mx + screen->getRootmenu()->getWidth() > screen->getWidth()) { | 986 | if (mx + screen->getRootmenu()->width() > screen->getWidth()) { |
| 987 | mx = screen->getWidth() - | 987 | mx = screen->getWidth() - |
| 988 | screen->getRootmenu()->getWidth() - | 988 | screen->getRootmenu()->width() - |
| 989 | screen->getBorderWidth(); | 989 | screen->getBorderWidth(); |
| 990 | } | 990 | } |
| 991 | 991 | ||
| 992 | if (my + screen->getRootmenu()->getHeight() > | 992 | if (my + screen->getRootmenu()->height() > |
| 993 | screen->getHeight()) { | 993 | screen->getHeight()) { |
| 994 | my = screen->getHeight() - | 994 | my = screen->getHeight() - |
| 995 | screen->getRootmenu()->getHeight() - | 995 | screen->getRootmenu()->height() - |
| 996 | screen->getBorderWidth(); | 996 | screen->getBorderWidth(); |
| 997 | } | 997 | } |
| 998 | screen->getRootmenu()->move(mx, my); | 998 | screen->getRootmenu()->move(mx, my); |