diff options
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r-- | src/FbWinFrame.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 09ce28e..ccbcaed 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.58 2003/10/06 09:28:35 rathnor Exp $ | 22 | // $Id: FbWinFrame.cc,v 1.59 2003/10/09 16:48:09 rathnor Exp $ |
23 | 23 | ||
24 | #include "FbWinFrame.hh" | 24 | #include "FbWinFrame.hh" |
25 | 25 | ||
@@ -238,8 +238,8 @@ void FbWinFrame::setFocus(bool newvalue) { | |||
238 | 238 | ||
239 | m_focused = newvalue; | 239 | m_focused = newvalue; |
240 | 240 | ||
241 | renderTitlebar(); | ||
242 | renderButtons(); | 241 | renderButtons(); |
242 | renderTitlebar(); | ||
243 | renderHandles(); | 243 | renderHandles(); |
244 | } | 244 | } |
245 | 245 | ||
@@ -726,10 +726,10 @@ void FbWinFrame::redrawTitle() { | |||
726 | } | 726 | } |
727 | 727 | ||
728 | if (isVisible()) { | 728 | if (isVisible()) { |
729 | m_titlebar.clear(); | ||
730 | m_titlebar.updateTransparent(); | ||
731 | m_label.clear(); | 729 | m_label.clear(); |
732 | m_label.updateTransparent(); | 730 | m_label.updateTransparent(); |
731 | m_titlebar.clear(); | ||
732 | m_titlebar.updateTransparent(); | ||
733 | } | 733 | } |
734 | } | 734 | } |
735 | 735 | ||
@@ -1004,6 +1004,7 @@ void FbWinFrame::setupButton(FbTk::Button &btn) { | |||
1004 | 1004 | ||
1005 | void FbWinFrame::render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm, | 1005 | void FbWinFrame::render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm, |
1006 | unsigned int w, unsigned int h) { | 1006 | unsigned int w, unsigned int h) { |
1007 | |||
1007 | Pixmap tmp = pm; | 1008 | Pixmap tmp = pm; |
1008 | if (tex.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | 1009 | if (tex.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { |
1009 | pm = None; | 1010 | pm = None; |
@@ -1051,6 +1052,7 @@ void FbWinFrame::getUnfocusPixmap(Pixmap &label_pm, Pixmap &title_pm, | |||
1051 | } | 1052 | } |
1052 | 1053 | ||
1053 | void FbWinFrame::renderLabelButtons() { | 1054 | void FbWinFrame::renderLabelButtons() { |
1055 | |||
1054 | Pixmap label_pm = 0; | 1056 | Pixmap label_pm = 0; |
1055 | Pixmap not_used_pm = 0; | 1057 | Pixmap not_used_pm = 0; |
1056 | FbTk::Color label_color; | 1058 | FbTk::Color label_color; |
@@ -1126,7 +1128,8 @@ void FbWinFrame::renderButtonFocus(FbTk::TextButton &button) { | |||
1126 | } | 1128 | } |
1127 | 1129 | ||
1128 | void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) { | 1130 | void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) { |
1129 | button.setGC(theme().labelTextUnfocusGC()); | 1131 | |
1132 | button.setGC(theme().labelTextUnfocusGC()); | ||
1130 | button.setJustify(theme().justify()); | 1133 | button.setJustify(theme().justify()); |
1131 | button.setBorderWidth(1); | 1134 | button.setBorderWidth(1); |
1132 | button.setAlpha(theme().alpha()); | 1135 | button.setAlpha(theme().alpha()); |