all repos — fluxbox @ 056a997e3934c58e183407349d4d45619822c89a

custom fork of the fluxbox windowmanager

fixed new theme items
fluxgen fluxgen
commit

056a997e3934c58e183407349d4d45619822c89a

parent

c136741213797b22a096b0e08daf2ceed9e08ab7

2 files changed, 26 insertions(+), 21 deletions(-)

jump to
M src/FbWinFrame.ccsrc/FbWinFrame.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbWinFrame.cc,v 1.49 2003/09/12 22:49:14 fluxgen Exp $ +// $Id: FbWinFrame.cc,v 1.50 2003/09/12 23:38:50 fluxgen Exp $ #include "FbWinFrame.hh"

@@ -236,10 +236,6 @@ }

void FbWinFrame::setDoubleClickTime(unsigned int time) { m_double_click_time = time; -} - -void FbWinFrame::setBevel(int bevel) { - m_bevel = bevel; } void FbWinFrame::addLeftButton(FbTk::Button *btn) {

@@ -596,6 +592,15 @@ void FbWinFrame::reconfigure() {

if (m_labelbuttons.size() == 0) return; + m_bevel = theme().bevelWidth(); + + handle().resize(handle().width(), + theme().handleWidth()); + gripLeft().resize(buttonHeight(), + theme().handleWidth()); + gripRight().resize(gripLeft().width(), + gripLeft().height()); + // align titlebar and render it if (m_use_titlebar) reconfigureTitlebar();

@@ -1107,21 +1112,21 @@ }

void FbWinFrame::updateTransparent() { redrawTitlebar(); - /* - ButtonList::iterator button_it = m_buttons_left.begin(); - ButtonList::iterator button_it_end = m_buttons_left.begin(); - for (; button_it != button_it_end; ++button_it) { - (*button_it)->clear(); - (*button_it)->updateTransparent(); - } + + ButtonList::iterator button_it = m_buttons_left.begin(); + ButtonList::iterator button_it_end = m_buttons_left.begin(); + for (; button_it != button_it_end; ++button_it) { + (*button_it)->clear(); + (*button_it)->updateTransparent(); + } + + button_it = m_buttons_right.begin(); + button_it_end = m_buttons_right.end(); + for (; button_it != button_it_end; ++button_it) { + (*button_it)->clear(); + (*button_it)->updateTransparent(); + } - button_it = m_buttons_right.begin(); - button_it_end = m_buttons_right.end(); - for (; button_it != button_it_end; ++button_it) { - (*button_it)->clear(); - (*button_it)->updateTransparent(); - } - */ m_grip_left.updateTransparent(); m_grip_right.updateTransparent(); m_handle.updateTransparent();
M src/FbWinFrame.hhsrc/FbWinFrame.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbWinFrame.hh,v 1.18 2003/09/12 22:49:14 fluxgen Exp $ +// $Id: FbWinFrame.hh,v 1.19 2003/09/12 23:38:50 fluxgen Exp $ #ifndef FBWINFRAME_HH #define FBWINFRAME_HH

@@ -86,7 +86,7 @@ void setTitle(const std::string &title);

/// set focus/unfocus style void setFocus(bool newvalue); void setDoubleClickTime(unsigned int time); - void setBevel(int bevel); + /// add a button to the left of the label void addLeftButton(FbTk::Button *btn); /// add a button to the right of the label