aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-06-04 15:48:43 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-06-04 15:48:43 (GMT)
commita39e3e33b5eece4c59a61c202152ad607e546d56 (patch)
tree8afc4a9074821a24915916663acd3c37a36a14d6
parentad6a7e48f47b06f24664eab21a9665558b704ff1 (diff)
downloadfluxbox-a39e3e33b5eece4c59a61c202152ad607e546d56.zip
fluxbox-a39e3e33b5eece4c59a61c202152ad607e546d56.tar.bz2
only remove outside border when disabled by decoration mask
-rw-r--r--ChangeLog3
-rw-r--r--src/FbWinFrame.cc9
-rw-r--r--src/FbWinFrame.hh4
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index dc0e68b..a4750fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1 2Changes for 1.1
3*08/06/04:
4 * Leave titlebar and handle borders alone with borderless windows (Mark)
5 FbWinFrame.cc/hh
3*08/06/03: 6*08/06/03:
4 * Add -list-commands command line option, which prints a list of valid 7 * Add -list-commands command line option, which prints a list of valid
5 fluxbox commands (Mark) 8 fluxbox commands (Mark)
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 5dd9bca..afd5fb5 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -1460,8 +1460,8 @@ void FbWinFrame::applyDecorations() {
1460} 1460}
1461 1461
1462bool FbWinFrame::setBorderWidth(bool do_move) { 1462bool FbWinFrame::setBorderWidth(bool do_move) {
1463 unsigned int border_width = m_decoration_mask & DECORM_BORDER ? 1463 unsigned int border_width = theme()->border().width();
1464 theme()->border().width() : 0; 1464 unsigned int win_bw = m_decoration_mask & DECORM_BORDER ? border_width : 0;
1465 1465
1466 if (border_width && 1466 if (border_width &&
1467 theme()->border().color().pixel() != window().borderColor()) { 1467 theme()->border().color().pixel() != window().borderColor()) {
@@ -1473,7 +1473,8 @@ bool FbWinFrame::setBorderWidth(bool do_move) {
1473 tabcontainer().setBorderColor(theme()->border().color()); 1473 tabcontainer().setBorderColor(theme()->border().color());
1474 } 1474 }
1475 1475
1476 if (border_width == window().borderWidth()) 1476 if (border_width == handle().borderWidth() &&
1477 win_bw == window().borderWidth())
1477 return false; 1478 return false;
1478 1479
1479 int grav_x=0, grav_y=0; 1480 int grav_x=0, grav_y=0;
@@ -1490,7 +1491,7 @@ bool FbWinFrame::setBorderWidth(bool do_move) {
1490 if (m_use_handle) 1491 if (m_use_handle)
1491 bw_changes += static_cast<signed>(border_width - handle().borderWidth()); 1492 bw_changes += static_cast<signed>(border_width - handle().borderWidth());
1492 1493
1493 window().setBorderWidth(border_width); 1494 window().setBorderWidth(win_bw);
1494 1495
1495 setTabMode(NOTSET); 1496 setTabMode(NOTSET);
1496 1497
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index f288253..e24612e 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -248,8 +248,8 @@ public:
248 bool isShaded() const { return m_shaded; } 248 bool isShaded() const { return m_shaded; }
249 FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; } 249 FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; }
250 /// @return titlebar height 250 /// @return titlebar height
251 unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } 251 unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_titlebar.borderWidth():0); }
252 unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } 252 unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_handle.borderWidth():0); }
253 /// @return size of button 253 /// @return size of button
254 unsigned int buttonHeight() const; 254 unsigned int buttonHeight() const;
255 bool externalTabMode() const { return m_tabmode == EXTERNAL && m_use_tabs; } 255 bool externalTabMode() const { return m_tabmode == EXTERNAL && m_use_tabs; }