aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-24 14:05:00 (GMT)
committerfluxgen <fluxgen>2003-06-24 14:05:00 (GMT)
commitcc217ded949b5a918ad5e7baddbd0fbaf817af7c (patch)
treeaa8b8b8373bcf793fe369a536436d761f656fcd8
parentd870f44fa47d26ae9b2c3a70da94b1ac7a6631af (diff)
downloadfluxbox-cc217ded949b5a918ad5e7baddbd0fbaf817af7c.zip
fluxbox-cc217ded949b5a918ad5e7baddbd0fbaf817af7c.tar.bz2
fixed minor button line bug
-rw-r--r--src/FbWinFrame.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 71122cc..e65e61b 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.28 2003/06/23 14:18:54 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.29 2003/06/24 14:05:00 fluxgen Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25#include "ImageControl.hh" 25#include "ImageControl.hh"
@@ -561,7 +561,9 @@ void FbWinFrame::redrawTitle() {
561 561
562 int button_width = label().width()/m_labelbuttons.size(); 562 int button_width = label().width()/m_labelbuttons.size();
563 //!! TODO: bevel 563 //!! TODO: bevel
564 int border_width = m_labelbuttons.front()->window().borderWidth(); 564 //int border_width = m_labelbuttons.front()->window().borderWidth();
565 int border_width = m_labelbuttons.size() != 0 ?
566 m_labelbuttons.front()->window().borderWidth() : 0;
565 567
566 ButtonList::iterator btn_it = m_labelbuttons.begin(); 568 ButtonList::iterator btn_it = m_labelbuttons.begin();
567 ButtonList::iterator btn_it_end = m_labelbuttons.end(); 569 ButtonList::iterator btn_it_end = m_labelbuttons.end();
@@ -570,7 +572,7 @@ void FbWinFrame::redrawTitle() {
570 ++btn_it, last_x += button_width + border_width) { 572 ++btn_it, last_x += button_width + border_width) {
571 // since we add border width pixel we should remove 573 // since we add border width pixel we should remove
572 // the same size for inside width so we can fit all buttons into label 574 // the same size for inside width so we can fit all buttons into label
573 (*btn_it)->moveResize(last_x - (last_x ? border_width : 0), - border_width, 575 (*btn_it)->moveResize(last_x - border_width, - border_width,
574 button_width, 576 button_width,
575 label().height() + border_width); 577 label().height() + border_width);
576 (*btn_it)->clear(); 578 (*btn_it)->clear();