only remove outside border when disabled by decoration mask
Mark Tiefenbruck mark@fluxbox.org
3 files changed,
10 insertions(+),
6 deletions(-)
M
src/FbWinFrame.cc
→
src/FbWinFrame.cc
@@ -1460,8 +1460,8 @@ frameExtentSig().notify();
} bool FbWinFrame::setBorderWidth(bool do_move) { - unsigned int border_width = m_decoration_mask & DECORM_BORDER ? - theme()->border().width() : 0; + unsigned int border_width = theme()->border().width(); + unsigned int win_bw = m_decoration_mask & DECORM_BORDER ? border_width : 0; if (border_width && theme()->border().color().pixel() != window().borderColor()) {@@ -1473,7 +1473,8 @@ gripRight().setBorderColor(theme()->border().color());
tabcontainer().setBorderColor(theme()->border().color()); } - if (border_width == window().borderWidth()) + if (border_width == handle().borderWidth() && + win_bw == window().borderWidth()) return false; int grav_x=0, grav_y=0;@@ -1490,7 +1491,7 @@ bw_changes += static_cast<signed>(border_width - titlebar().borderWidth());
if (m_use_handle) bw_changes += static_cast<signed>(border_width - handle().borderWidth()); - window().setBorderWidth(border_width); + window().setBorderWidth(win_bw); setTabMode(NOTSET);
M
src/FbWinFrame.hh
→
src/FbWinFrame.hh
@@ -248,8 +248,8 @@ bool focused() const { return m_focused; }
bool isShaded() const { return m_shaded; } FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; } /// @return titlebar height - unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } - unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } + unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_titlebar.borderWidth():0); } + unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_handle.borderWidth():0); } /// @return size of button unsigned int buttonHeight() const; bool externalTabMode() const { return m_tabmode == EXTERNAL && m_use_tabs; }