aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-06-19 08:39:00 (GMT)
committersimonb <simonb>2006-06-19 08:39:00 (GMT)
commita6146af44f3ef1f44894d5545f449f46db8a3c79 (patch)
tree9dbc92180b02c95cce23ffe6b15751f3c5dc3b5a
parentf6140840f85e35354c219e3a505c6d1aeb4d3837 (diff)
downloadfluxbox-a6146af44f3ef1f44894d5545f449f46db8a3c79.zip
fluxbox-a6146af44f3ef1f44894d5545f449f46db8a3c79.tar.bz2
fix placement issue with xinerama (only hit if screens are vertically aligned)
-rw-r--r--ChangeLog4
-rw-r--r--src/FbTk/Menu.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a2b5f8..2e01d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc2: 2Changes for 1.0rc2:
3*06/06/19: 3*06/06/19:
4 * Fix menu placement issue with (vertical) xinerama (Simon)
5 - note, doesn't fix "submenus open on wrong screen" issue, that requires
6 some more serious data movement.
7 FbTk/Menu.cc
4 * Fix bug #1507671, clock not updating on multiple screens (Simon) 8 * Fix bug #1507671, clock not updating on multiple screens (Simon)
5 - time() and gettimeofday() are inconsistent, only use gettimeofday 9 - time() and gettimeofday() are inconsistent, only use gettimeofday
6 - clean up Timer stuff a bit, fixed some other bugs 10 - clean up Timer stuff a bit, fixed some other bugs
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index d400e00..b0e5c4e 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -1075,8 +1075,8 @@ void Menu::enterNotifyEvent(XCrossingEvent &ce) {
1075 m_shifted = true; 1075 m_shifted = true;
1076 } 1076 }
1077 1077
1078 if (y() + height() + 2*theme().borderWidth() > m_screen_height) { 1078 if (y() + height() + 2*theme().borderWidth() > m_screen_y + m_screen_height) {
1079 menu.y_shift = m_screen_height - height() - 2*theme().borderWidth(); 1079 menu.y_shift = m_screen_y + m_screen_height - height() - 2*theme().borderWidth();
1080 m_shifted = true; 1080 m_shifted = true;
1081 } else if (y() + (signed) theme().titleHeight() < 0) { 1081 } else if (y() + (signed) theme().titleHeight() < 0) {
1082 menu.y_shift = 0; // -theme().borderWidth();; 1082 menu.y_shift = 0; // -theme().borderWidth();;