diff options
author | fluxgen <fluxgen> | 2003-09-12 23:38:50 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-09-12 23:38:50 (GMT) |
commit | 056a997e3934c58e183407349d4d45619822c89a (patch) | |
tree | d8e43ca545dc0c2f0df2f14dcbb140c618017e6e | |
parent | c136741213797b22a096b0e08daf2ceed9e08ab7 (diff) | |
download | fluxbox-056a997e3934c58e183407349d4d45619822c89a.zip fluxbox-056a997e3934c58e183407349d4d45619822c89a.tar.bz2 |
fixed new theme items
-rw-r--r-- | src/FbWinFrame.cc | 45 | ||||
-rw-r--r-- | src/FbWinFrame.hh | 4 |
2 files changed, 27 insertions, 22 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 387b159..81ba7de 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.49 2003/09/12 22:49:14 fluxgen Exp $ | 22 | // $Id: FbWinFrame.cc,v 1.50 2003/09/12 23:38:50 fluxgen Exp $ |
23 | 23 | ||
24 | #include "FbWinFrame.hh" | 24 | #include "FbWinFrame.hh" |
25 | 25 | ||
@@ -238,10 +238,6 @@ void FbWinFrame::setDoubleClickTime(unsigned int time) { | |||
238 | m_double_click_time = time; | 238 | m_double_click_time = time; |
239 | } | 239 | } |
240 | 240 | ||
241 | void FbWinFrame::setBevel(int bevel) { | ||
242 | m_bevel = bevel; | ||
243 | } | ||
244 | |||
245 | void FbWinFrame::addLeftButton(FbTk::Button *btn) { | 241 | void FbWinFrame::addLeftButton(FbTk::Button *btn) { |
246 | if (btn == 0) // valid button? | 242 | if (btn == 0) // valid button? |
247 | return; | 243 | return; |
@@ -596,6 +592,15 @@ void FbWinFrame::reconfigure() { | |||
596 | if (m_labelbuttons.size() == 0) | 592 | if (m_labelbuttons.size() == 0) |
597 | return; | 593 | return; |
598 | 594 | ||
595 | m_bevel = theme().bevelWidth(); | ||
596 | |||
597 | handle().resize(handle().width(), | ||
598 | theme().handleWidth()); | ||
599 | gripLeft().resize(buttonHeight(), | ||
600 | theme().handleWidth()); | ||
601 | gripRight().resize(gripLeft().width(), | ||
602 | gripLeft().height()); | ||
603 | |||
599 | // align titlebar and render it | 604 | // align titlebar and render it |
600 | if (m_use_titlebar) | 605 | if (m_use_titlebar) |
601 | reconfigureTitlebar(); | 606 | reconfigureTitlebar(); |
@@ -1107,21 +1112,21 @@ void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) { | |||
1107 | 1112 | ||
1108 | void FbWinFrame::updateTransparent() { | 1113 | void FbWinFrame::updateTransparent() { |
1109 | redrawTitlebar(); | 1114 | redrawTitlebar(); |
1110 | /* | 1115 | |
1111 | ButtonList::iterator button_it = m_buttons_left.begin(); | 1116 | ButtonList::iterator button_it = m_buttons_left.begin(); |
1112 | ButtonList::iterator button_it_end = m_buttons_left.begin(); | 1117 | ButtonList::iterator button_it_end = m_buttons_left.begin(); |
1113 | for (; button_it != button_it_end; ++button_it) { | 1118 | for (; button_it != button_it_end; ++button_it) { |
1114 | (*button_it)->clear(); | 1119 | (*button_it)->clear(); |
1115 | (*button_it)->updateTransparent(); | 1120 | (*button_it)->updateTransparent(); |
1116 | } | 1121 | } |
1117 | 1122 | ||
1118 | button_it = m_buttons_right.begin(); | 1123 | button_it = m_buttons_right.begin(); |
1119 | button_it_end = m_buttons_right.end(); | 1124 | button_it_end = m_buttons_right.end(); |
1120 | for (; button_it != button_it_end; ++button_it) { | 1125 | for (; button_it != button_it_end; ++button_it) { |
1121 | (*button_it)->clear(); | 1126 | (*button_it)->clear(); |
1122 | (*button_it)->updateTransparent(); | 1127 | (*button_it)->updateTransparent(); |
1123 | } | 1128 | } |
1124 | */ | 1129 | |
1125 | m_grip_left.updateTransparent(); | 1130 | m_grip_left.updateTransparent(); |
1126 | m_grip_right.updateTransparent(); | 1131 | m_grip_right.updateTransparent(); |
1127 | m_handle.updateTransparent(); | 1132 | m_handle.updateTransparent(); |
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index 3040b68..70ecaf0 100644 --- a/src/FbWinFrame.hh +++ b/src/FbWinFrame.hh | |||
@@ -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.hh,v 1.18 2003/09/12 22:49:14 fluxgen Exp $ | 22 | // $Id: FbWinFrame.hh,v 1.19 2003/09/12 23:38:50 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef FBWINFRAME_HH | 24 | #ifndef FBWINFRAME_HH |
25 | #define FBWINFRAME_HH | 25 | #define FBWINFRAME_HH |
@@ -86,7 +86,7 @@ public: | |||
86 | /// set focus/unfocus style | 86 | /// set focus/unfocus style |
87 | void setFocus(bool newvalue); | 87 | void setFocus(bool newvalue); |
88 | void setDoubleClickTime(unsigned int time); | 88 | void setDoubleClickTime(unsigned int time); |
89 | void setBevel(int bevel); | 89 | |
90 | /// add a button to the left of the label | 90 | /// add a button to the left of the label |
91 | void addLeftButton(FbTk::Button *btn); | 91 | void addLeftButton(FbTk::Button *btn); |
92 | /// add a button to the right of the label | 92 | /// add a button to the right of the label |