aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-13 09:34:40 (GMT)
committerfluxgen <fluxgen>2003-08-13 09:34:40 (GMT)
commit6b12f0c31af4d2f44fe2960dce3183ffd263bafc (patch)
treed1f54b48ab3d092efa08e26cd7a65437e5190690
parentea4adcf69514a7595e46206e7e0f4c2d92f7255d (diff)
downloadfluxbox_paul-6b12f0c31af4d2f44fe2960dce3183ffd263bafc.zip
fluxbox_paul-6b12f0c31af4d2f44fe2960dce3183ffd263bafc.tar.bz2
button changed to a Fbwindow
-rw-r--r--src/FbWinFrame.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 67347d4..9b2a9e8 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.34 2003/08/11 15:03:11 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.35 2003/08/13 09:34:40 fluxgen Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25#include "ImageControl.hh" 25#include "ImageControl.hh"
@@ -171,13 +171,13 @@ void FbWinFrame::move(int x, int y) {
171 ButtonList::iterator btn_it_end = m_buttons_left.begin(); 171 ButtonList::iterator btn_it_end = m_buttons_left.begin();
172 for (; btn_it != btn_it_end; ++btn_it) { 172 for (; btn_it != btn_it_end; ++btn_it) {
173 (*btn_it)->clear(); 173 (*btn_it)->clear();
174 (*btn_it)->window().updateTransparent(); 174 (*btn_it)->updateTransparent();
175 } 175 }
176 btn_it = m_buttons_right.begin(); 176 btn_it = m_buttons_right.begin();
177 btn_it_end = m_buttons_right.end(); 177 btn_it_end = m_buttons_right.end();
178 for (; btn_it != btn_it_end; ++btn_it) { 178 for (; btn_it != btn_it_end; ++btn_it) {
179 (*btn_it)->clear(); 179 (*btn_it)->clear();
180 (*btn_it)->window().updateTransparent(); 180 (*btn_it)->updateTransparent();
181 } 181 }
182 m_grip_left.clear(); 182 m_grip_left.clear();
183 m_grip_right.clear(); 183 m_grip_right.clear();
@@ -663,7 +663,7 @@ void FbWinFrame::redrawTitle() {
663 //!! TODO: bevel 663 //!! TODO: bevel
664 //int border_width = m_labelbuttons.front()->window().borderWidth(); 664 //int border_width = m_labelbuttons.front()->window().borderWidth();
665 int border_width = m_labelbuttons.size() != 0 ? 665 int border_width = m_labelbuttons.size() != 0 ?
666 m_labelbuttons.front()->window().borderWidth() : 0; 666 m_labelbuttons.front()->borderWidth() : 0;
667 667
668 LabelList::iterator btn_it = m_labelbuttons.begin(); 668 LabelList::iterator btn_it = m_labelbuttons.begin();
669 LabelList::iterator btn_it_end = m_labelbuttons.end(); 669 LabelList::iterator btn_it_end = m_labelbuttons.end();
@@ -676,7 +676,7 @@ void FbWinFrame::redrawTitle() {
676 button_width, 676 button_width,
677 label().height() + border_width); 677 label().height() + border_width);
678 (*btn_it)->clear(); 678 (*btn_it)->clear();
679 (*btn_it)->window().updateTransparent(); 679 (*btn_it)->updateTransparent();
680 } 680 }
681 681
682} 682}
@@ -922,7 +922,7 @@ void FbWinFrame::setupButton(FbTk::Button &btn) {
922 922
923 } 923 }
924 924
925 btn.window().setAlpha(theme().alpha()); 925 btn.setAlpha(theme().alpha());
926 btn.clear(); 926 btn.clear();
927} 927}
928 928
@@ -941,7 +941,7 @@ void FbWinFrame::render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm,
941} 941}
942 942
943void FbWinFrame::getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm, 943void FbWinFrame::getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm,
944 FbTk::Color &label_color, FbTk::Color &title_color) { 944 FbTk::Color &label_color, FbTk::Color &title_color) {
945 if (m_focused) { 945 if (m_focused) {
946 if (m_label_focused_pm != 0) 946 if (m_label_focused_pm != 0)
947 label_pm = m_label_focused_pm; 947 label_pm = m_label_focused_pm;
@@ -988,8 +988,8 @@ void FbWinFrame::renderLabelButtons() {
988 for (; btn_it != btn_it_end; ++btn_it) { 988 for (; btn_it != btn_it_end; ++btn_it) {
989 989
990 (*btn_it)->setGC(theme().labelTextFocusGC()); 990 (*btn_it)->setGC(theme().labelTextFocusGC());
991 (*btn_it)->window().setBorderWidth(1); 991 (*btn_it)->setBorderWidth(1);
992 (*btn_it)->window().setAlpha(theme().alpha()); 992 (*btn_it)->setAlpha(theme().alpha());
993 993
994 if (m_label_unfocused_pm != 0) 994 if (m_label_unfocused_pm != 0)
995 (*btn_it)->setBackgroundPixmap(m_label_unfocused_pm); 995 (*btn_it)->setBackgroundPixmap(m_label_unfocused_pm);