diff options
author | fluxgen <fluxgen> | 2004-01-17 00:49:20 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2004-01-17 00:49:20 (GMT) |
commit | cd9d9941e6a1a132a16df19ea1eca65f49361133 (patch) | |
tree | 07fd28ef81eb90e181058b8a5ec726873de2748f | |
parent | 2e5776733219a5f3c6ab3acd0f4f369be76b764a (diff) | |
download | fluxbox_paul-cd9d9941e6a1a132a16df19ea1eca65f49361133.zip fluxbox_paul-cd9d9941e6a1a132a16df19ea1eca65f49361133.tar.bz2 |
minor fixes, fixed popupMenu position if m_last_button_x is outside window
-rw-r--r-- | src/Window.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc index 5f024bd..8a3bb31 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.261 2004/01/16 11:58:45 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.262 2004/01/17 00:49:20 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -1942,7 +1942,8 @@ void FluxboxWindow::popupMenu() { | |||
1942 | int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth(); | 1942 | int menu_y = frame().titlebar().height() + frame().titlebar().borderWidth(); |
1943 | if (!decorations.titlebar) // if we don't have any titlebar | 1943 | if (!decorations.titlebar) // if we don't have any titlebar |
1944 | menu_y = 0; | 1944 | menu_y = 0; |
1945 | 1945 | if (m_last_button_x < x() || m_last_button_x > x() + width()) | |
1946 | m_last_button_x = x(); | ||
1946 | showMenu(m_last_button_x, menu_y + frame().y()); | 1947 | showMenu(m_last_button_x, menu_y + frame().y()); |
1947 | } | 1948 | } |
1948 | 1949 | ||
@@ -3328,8 +3329,6 @@ void FluxboxWindow::setupWindow() { | |||
3328 | 3329 | ||
3329 | WinButtonTheme &winbutton_theme = screen().winButtonTheme(); | 3330 | WinButtonTheme &winbutton_theme = screen().winButtonTheme(); |
3330 | 3331 | ||
3331 | typedef FbTk::RefCount<FbTk::Command> CommandRef; | ||
3332 | |||
3333 | using namespace FbTk; | 3332 | using namespace FbTk; |
3334 | typedef RefCount<Command> CommandRef; | 3333 | typedef RefCount<Command> CommandRef; |
3335 | typedef SimpleCommand<FluxboxWindow> WindowCmd; | 3334 | typedef SimpleCommand<FluxboxWindow> WindowCmd; |