aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrame.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-01-10 00:37:35 (GMT)
committerrathnor <rathnor>2004-01-10 00:37:35 (GMT)
commit5e87ca1ea430fe325d58d388af2543783e6dd640 (patch)
treeeb888542f5266889f9a49f294d077f68ceb2d40b /src/FbWinFrame.cc
parent7b4e2364bf3d6feaf783999e173955829dfc9328 (diff)
downloadfluxbox_pavel-5e87ca1ea430fe325d58d388af2543783e6dd640.zip
fluxbox_pavel-5e87ca1ea430fe325d58d388af2543783e6dd640.tar.bz2
fix some minor transparency issues
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r--src/FbWinFrame.cc28
1 files changed, 10 insertions, 18 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index fed91f9..36c8e81 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.68 2004/01/02 13:26:44 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.69 2004/01/10 00:37:35 rathnor Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25 25
@@ -560,7 +560,10 @@ void FbWinFrame::buttonReleaseEvent(XButtonEvent &event) {
560} 560}
561 561
562void FbWinFrame::exposeEvent(XExposeEvent &event) { 562void FbWinFrame::exposeEvent(XExposeEvent &event) {
563 if (m_label == event.window) { 563 if (m_titlebar == event.window) {
564 m_titlebar.clearArea(event.x, event.y, event.width, event.height);
565 m_titlebar.updateTransparent(event.x, event.y, event.width, event.height);
566 } else if (m_label == event.window) {
564 m_label.clearArea(event.x, event.y, event.width, event.height); 567 m_label.clearArea(event.x, event.y, event.width, event.height);
565 m_label.updateTransparent(event.x, event.y, event.width, event.height); 568 m_label.updateTransparent(event.x, event.y, event.width, event.height);
566 } else if (m_handle == event.window) { 569 } else if (m_handle == event.window) {
@@ -853,7 +856,6 @@ void FbWinFrame::renderTitlebar() {
853 getCurrentFocusPixmap(label_pm, title_pm, 856 getCurrentFocusPixmap(label_pm, title_pm,
854 label_color, title_color); 857 label_color, title_color);
855 858
856
857 if (label_pm != 0) 859 if (label_pm != 0)
858 m_label.setBackgroundPixmap(label_pm); 860 m_label.setBackgroundPixmap(label_pm);
859 else 861 else
@@ -864,6 +866,9 @@ void FbWinFrame::renderTitlebar() {
864 else 866 else
865 m_titlebar.setBackgroundColor(title_color); 867 m_titlebar.setBackgroundColor(title_color);
866 868
869 m_titlebar.setAlpha(theme().alpha());
870 m_label.setAlpha(theme().alpha());
871
867 renderLabelButtons(); 872 renderLabelButtons();
868 redrawTitlebar(); 873 redrawTitlebar();
869} 874}
@@ -921,16 +926,8 @@ void FbWinFrame::renderHandles() {
921 } 926 }
922 927
923 m_handle.setAlpha(theme().alpha()); 928 m_handle.setAlpha(theme().alpha());
924 m_handle.clear();
925 m_handle.updateTransparent();
926
927 m_grip_left.setAlpha(theme().alpha()); 929 m_grip_left.setAlpha(theme().alpha());
928 m_grip_left.clear();
929 m_grip_left.updateTransparent();
930
931 m_grip_right.setAlpha(theme().alpha()); 930 m_grip_right.setAlpha(theme().alpha());
932 m_grip_right.clear();
933 m_grip_right.updateTransparent();
934 931
935} 932}
936 933
@@ -1160,8 +1157,6 @@ void FbWinFrame::renderButtonFocus(FbTk::TextButton &button) {
1160 } else 1157 } else
1161 button.setBackgroundColor(m_label_focused_color); 1158 button.setBackgroundColor(m_label_focused_color);
1162 1159
1163 button.clear();
1164 button.updateTransparent();
1165} 1160}
1166 1161
1167void FbWinFrame::renderButtonActive(FbTk::TextButton &button) { 1162void FbWinFrame::renderButtonActive(FbTk::TextButton &button) {
@@ -1178,8 +1173,6 @@ void FbWinFrame::renderButtonActive(FbTk::TextButton &button) {
1178 } else 1173 } else
1179 button.setBackgroundColor(m_label_active_color); 1174 button.setBackgroundColor(m_label_active_color);
1180 1175
1181 button.clear();
1182 button.updateTransparent();
1183} 1176}
1184 1177
1185void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) { 1178void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) {
@@ -1196,15 +1189,13 @@ void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) {
1196 } else 1189 } else
1197 button.setBackgroundColor(m_label_unfocused_color); 1190 button.setBackgroundColor(m_label_unfocused_color);
1198 1191
1199 button.clear();
1200 button.updateTransparent();
1201} 1192}
1202 1193
1203void FbWinFrame::updateTransparent() { 1194void FbWinFrame::updateTransparent() {
1204 redrawTitlebar(); 1195 redrawTitlebar();
1205 1196
1206 ButtonList::iterator button_it = m_buttons_left.begin(); 1197 ButtonList::iterator button_it = m_buttons_left.begin();
1207 ButtonList::iterator button_it_end = m_buttons_left.begin(); 1198 ButtonList::iterator button_it_end = m_buttons_left.end();
1208 for (; button_it != button_it_end; ++button_it) { 1199 for (; button_it != button_it_end; ++button_it) {
1209 (*button_it)->clear(); 1200 (*button_it)->clear();
1210 (*button_it)->updateTransparent(); 1201 (*button_it)->updateTransparent();
@@ -1223,6 +1214,7 @@ void FbWinFrame::updateTransparent() {
1223 m_grip_right.updateTransparent(); 1214 m_grip_right.updateTransparent();
1224 m_handle.clear(); 1215 m_handle.clear();
1225 m_handle.updateTransparent(); 1216 m_handle.updateTransparent();
1217
1226} 1218}
1227 1219
1228 1220