aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-12-07 16:39:43 (GMT)
committerfluxgen <fluxgen>2003-12-07 16:39:43 (GMT)
commitc5b79ed14b350130226a5f978edc8c55caa190a3 (patch)
tree9d79b213de852728d54ea21671d22e681ee18670
parentd2959aeb6b86b4a43168a9f9fbd123a68c1f821e (diff)
downloadfluxbox_pavel-c5b79ed14b350130226a5f978edc8c55caa190a3.zip
fluxbox_pavel-c5b79ed14b350130226a5f978edc8c55caa190a3.tar.bz2
usePixmap from Texture
-rw-r--r--src/ButtonTool.cc7
-rw-r--r--src/ClockTool.cc4
-rw-r--r--src/FbWinFrame.cc4
-rw-r--r--src/IconbarTool.cc8
-rw-r--r--src/Screen.cc8
-rw-r--r--src/Slit.cc7
-rw-r--r--src/Toolbar.cc4
-rw-r--r--src/WorkspaceNameTool.cc4
8 files changed, 21 insertions, 25 deletions
diff --git a/src/ButtonTool.cc b/src/ButtonTool.cc
index 7f350f5..6a3dfa4 100644
--- a/src/ButtonTool.cc
+++ b/src/ButtonTool.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: ButtonTool.cc,v 1.1 2003/10/13 23:38:17 fluxgen Exp $ 22// $Id: ButtonTool.cc,v 1.2 2003/12/07 16:39:43 fluxgen Exp $
23 23
24#include "ButtonTool.hh" 24#include "ButtonTool.hh"
25 25
@@ -56,7 +56,7 @@ void ButtonTool::renderTheme() {
56 btn.setBorderWidth(theme().border().width()); 56 btn.setBorderWidth(theme().border().width());
57 57
58 Pixmap old_pm = m_cache_pm; 58 Pixmap old_pm = m_cache_pm;
59 if (theme().texture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 59 if (!theme().texture().usePixmap()) {
60 m_cache_pm = 0; 60 m_cache_pm = 0;
61 btn.setBackgroundColor(theme().texture().color()); 61 btn.setBackgroundColor(theme().texture().color());
62 } else { 62 } else {
@@ -68,8 +68,7 @@ void ButtonTool::renderTheme() {
68 m_image_ctrl.removeImage(old_pm); 68 m_image_ctrl.removeImage(old_pm);
69 69
70 old_pm = m_cache_pressed_pm; 70 old_pm = m_cache_pressed_pm;
71 if (static_cast<const ButtonTheme &>(theme()).pressed().type() == 71 if (! static_cast<const ButtonTheme &>(theme()).pressed().usePixmap()) {
72 (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
73 m_cache_pressed_pm = 0; 72 m_cache_pressed_pm = 0;
74 btn.setPressedColor(static_cast<const ButtonTheme &>(theme()).pressed().color()); 73 btn.setPressedColor(static_cast<const ButtonTheme &>(theme()).pressed().color());
75 } else { 74 } else {
diff --git a/src/ClockTool.cc b/src/ClockTool.cc
index c23028f..10b9ad5 100644
--- a/src/ClockTool.cc
+++ b/src/ClockTool.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: ClockTool.cc,v 1.7 2003/12/06 16:49:06 fluxgen Exp $ 23// $Id: ClockTool.cc,v 1.8 2003/12/07 16:39:43 fluxgen Exp $
24 24
25#include "ClockTool.hh" 25#include "ClockTool.hh"
26 26
@@ -216,7 +216,7 @@ void ClockTool::updateTime() {
216 216
217void ClockTool::renderTheme() { 217void ClockTool::renderTheme() {
218 Pixmap old_pm = m_pixmap; 218 Pixmap old_pm = m_pixmap;
219 if (m_theme.texture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 219 if (!m_theme.texture().usePixmap()) {
220 m_pixmap = 0; 220 m_pixmap = 0;
221 m_button.setBackgroundColor(m_theme.texture().color()); 221 m_button.setBackgroundColor(m_theme.texture().color());
222 } else { 222 } else {
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 1e3cb97..2ff7203 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.62 2003/10/31 10:37:09 rathnor Exp $ 22// $Id: FbWinFrame.cc,v 1.63 2003/12/07 16:39:43 fluxgen Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25 25
@@ -1024,7 +1024,7 @@ void FbWinFrame::render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm,
1024 unsigned int w, unsigned int h) { 1024 unsigned int w, unsigned int h) {
1025 1025
1026 Pixmap tmp = pm; 1026 Pixmap tmp = pm;
1027 if (tex.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 1027 if (!tex.usePixmap()) {
1028 pm = None; 1028 pm = None;
1029 col = tex.color(); 1029 col = tex.color();
1030 } else 1030 } else
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 80dc5fd..6f5356c 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconbarTool.cc,v 1.18 2003/12/03 00:16:56 fluxgen Exp $ 23// $Id: IconbarTool.cc,v 1.19 2003/12/07 16:39:43 fluxgen Exp $
24 24
25#include "IconbarTool.hh" 25#include "IconbarTool.hh"
26 26
@@ -416,7 +416,7 @@ void IconbarTool::renderWindow(FluxboxWindow &win) {
416 416
417void IconbarTool::renderTheme() { 417void IconbarTool::renderTheme() {
418 Pixmap tmp = m_focused_pm; 418 Pixmap tmp = m_focused_pm;
419 if (m_theme.focusedTexture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 419 if (!m_theme.focusedTexture().usePixmap()) {
420 m_focused_pm = 0; 420 m_focused_pm = 0;
421 } else { 421 } else {
422 m_focused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(), 422 m_focused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(),
@@ -428,7 +428,7 @@ void IconbarTool::renderTheme() {
428 m_screen.imageControl().removeImage(tmp); 428 m_screen.imageControl().removeImage(tmp);
429 429
430 tmp = m_unfocused_pm; 430 tmp = m_unfocused_pm;
431 if (m_theme.unfocusedTexture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 431 if (!m_theme.unfocusedTexture().usePixmap()) {
432 m_unfocused_pm = 0; 432 m_unfocused_pm = 0;
433 } else { 433 } else {
434 m_unfocused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(), 434 m_unfocused_pm = m_screen.imageControl().renderImage(m_icon_container.maxWidthPerClient(),
@@ -440,7 +440,7 @@ void IconbarTool::renderTheme() {
440 440
441 // if we dont have any icons then we should render empty texture 441 // if we dont have any icons then we should render empty texture
442 tmp = m_empty_pm; 442 tmp = m_empty_pm;
443 if (m_theme.emptyTexture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 443 if (!m_theme.emptyTexture().usePixmap()) {
444 m_empty_pm = 0; 444 m_empty_pm = 0;
445 m_icon_container.setBackgroundColor(m_theme.emptyTexture().color()); 445 m_icon_container.setBackgroundColor(m_theme.emptyTexture().color());
446 } else { 446 } else {
diff --git a/src/Screen.cc b/src/Screen.cc
index 4a4141e..7ac60d6 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.244 2003/12/04 21:31:02 fluxgen Exp $ 25// $Id: Screen.cc,v 1.245 2003/12/07 16:39:43 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -2160,8 +2160,7 @@ void BScreen::renderGeomWindow() {
2160 Pixmap tmp = geom_pixmap; 2160 Pixmap tmp = geom_pixmap;
2161 2161
2162 if (winFrameTheme().labelFocusTexture().type() & FbTk::Texture::PARENTRELATIVE) { 2162 if (winFrameTheme().labelFocusTexture().type() & FbTk::Texture::PARENTRELATIVE) {
2163 if (winFrameTheme().titleFocusTexture().type() == 2163 if (!winFrameTheme().titleFocusTexture().usePixmap()) {
2164 (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
2165 geom_pixmap = None; 2164 geom_pixmap = None;
2166 m_geom_window.setBackgroundColor(winFrameTheme().titleFocusTexture().color()); 2165 m_geom_window.setBackgroundColor(winFrameTheme().titleFocusTexture().color());
2167 } else { 2166 } else {
@@ -2170,8 +2169,7 @@ void BScreen::renderGeomWindow() {
2170 m_geom_window.setBackgroundPixmap(geom_pixmap); 2169 m_geom_window.setBackgroundPixmap(geom_pixmap);
2171 } 2170 }
2172 } else { 2171 } else {
2173 if (winFrameTheme().labelFocusTexture().type() == 2172 if (!winFrameTheme().labelFocusTexture().usePixmap()) {
2174 (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
2175 geom_pixmap = None; 2173 geom_pixmap = None;
2176 m_geom_window.setBackgroundColor(winFrameTheme().labelFocusTexture().color()); 2174 m_geom_window.setBackgroundColor(winFrameTheme().labelFocusTexture().color());
2177 } else { 2175 } else {
diff --git a/src/Slit.cc b/src/Slit.cc
index 422d0e4..6d037d6 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Slit.cc,v 1.81 2003/11/01 00:12:53 rathnor Exp $ 25// $Id: Slit.cc,v 1.82 2003/12/07 16:39:43 fluxgen Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -708,9 +708,8 @@ void Slit::reconfigure() {
708 Pixmap tmp = frame.pixmap; 708 Pixmap tmp = frame.pixmap;
709 FbTk::ImageControl &image_ctrl = screen().imageControl(); 709 FbTk::ImageControl &image_ctrl = screen().imageControl();
710 const FbTk::Texture &texture = m_slit_theme->texture(); 710 const FbTk::Texture &texture = m_slit_theme->texture();
711 if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID) && 711 if (!texture.usePixmap()) {
712 texture.pixmap().drawable() == 0) { 712 frame.pixmap = 0;
713 frame.pixmap = None;
714 frame.window.setBackgroundColor(texture.color()); 713 frame.window.setBackgroundColor(texture.color());
715 } else { 714 } else {
716 frame.pixmap = image_ctrl.renderImage(frame.width, frame.height, 715 frame.pixmap = image_ctrl.renderImage(frame.width, frame.height,
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 01d5b60..5ec6480 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.128 2003/12/07 15:27:52 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.129 2003/12/07 16:39:43 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -432,7 +432,7 @@ void Toolbar::reconfigure() {
432 432
433 // render frame window 433 // render frame window
434 Pixmap tmp = m_window_pm; 434 Pixmap tmp = m_window_pm;
435 if (theme().toolbar().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 435 if (!theme().toolbar().usePixmap()) {
436 m_window_pm = 0; 436 m_window_pm = 0;
437 frame.window.setBackgroundColor(theme().toolbar().color()); 437 frame.window.setBackgroundColor(theme().toolbar().color());
438 } else { 438 } else {
diff --git a/src/WorkspaceNameTool.cc b/src/WorkspaceNameTool.cc
index fe1fa6f..e0a01f9 100644
--- a/src/WorkspaceNameTool.cc
+++ b/src/WorkspaceNameTool.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: WorkspaceNameTool.cc,v 1.5 2003/08/26 23:20:07 fluxgen Exp $ 23// $Id: WorkspaceNameTool.cc,v 1.6 2003/12/07 16:39:43 fluxgen Exp $
24 24
25#include "WorkspaceNameTool.hh" 25#include "WorkspaceNameTool.hh"
26 26
@@ -109,7 +109,7 @@ void WorkspaceNameTool::hide() {
109 109
110void WorkspaceNameTool::renderTheme() { 110void WorkspaceNameTool::renderTheme() {
111 Pixmap tmp = m_pixmap; 111 Pixmap tmp = m_pixmap;
112 if (m_theme.texture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { 112 if (!m_theme.texture().usePixmap()) {
113 m_pixmap = 0; 113 m_pixmap = 0;
114 m_button.setBackgroundColor(m_theme.texture().color()); 114 m_button.setBackgroundColor(m_theme.texture().color());
115 } else { 115 } else {