diff options
author | rathnor <rathnor> | 2003-10-30 20:27:51 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-10-30 20:27:51 (GMT) |
commit | d617c5288fe37972b474f86b653e5541553f93de (patch) | |
tree | dd15f9d2334e205ad324c35d110fe8f959fecc5e | |
parent | a07d7d0e732b2b1614aded167be1d69282cf1626 (diff) | |
download | fluxbox_paul-d617c5288fe37972b474f86b653e5541553f93de.zip fluxbox_paul-d617c5288fe37972b474f86b653e5541553f93de.tar.bz2 |
fix handling of zero handleWidth in themes
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/FbWinFrame.cc | 7 |
2 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,8 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.6: | 2 | Changes for 0.9.6: |
3 | *03/10/30: | ||
4 | * Fix handling of theme's with a zero handleWidth (Simon) | ||
5 | FbWinFrame.cc | ||
3 | *03/10/28: | 6 | *03/10/28: |
4 | * Fix building with --disable-slit (Simon) | 7 | * Fix building with --disable-slit (Simon) |
5 | Screen.cc | 8 | Screen.cc |
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 0d84fd6..862ec29 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: FbWinFrame.cc,v 1.60 2003/10/28 02:17:02 rathnor Exp $ | 22 | // $Id: FbWinFrame.cc,v 1.61 2003/10/30 20:27:51 rathnor Exp $ |
23 | 23 | ||
24 | #include "FbWinFrame.hh" | 24 | #include "FbWinFrame.hh" |
25 | 25 | ||
@@ -434,7 +434,7 @@ bool FbWinFrame::hideHandle() { | |||
434 | } | 434 | } |
435 | 435 | ||
436 | bool FbWinFrame::showHandle() { | 436 | bool FbWinFrame::showHandle() { |
437 | if (m_use_handle) | 437 | if (m_use_handle || theme().handleWidth() == 0) |
438 | return false; | 438 | return false; |
439 | 439 | ||
440 | m_handle.show(); | 440 | m_handle.show(); |
@@ -954,6 +954,9 @@ void FbWinFrame::init() { | |||
954 | m_update_timer.setTimeout(10L); | 954 | m_update_timer.setTimeout(10L); |
955 | m_update_timer.fireOnce(true); | 955 | m_update_timer.fireOnce(true); |
956 | 956 | ||
957 | if (theme().handleWidth() == 0) | ||
958 | m_use_handle = false; | ||
959 | |||
957 | m_disable_shape = false; | 960 | m_disable_shape = false; |
958 | 961 | ||
959 | m_current_label = 0; // no focused button at first | 962 | m_current_label = 0; // no focused button at first |