aboutsummaryrefslogtreecommitdiff
path: root/src/ButtonTool.cc
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 /src/ButtonTool.cc
parentd2959aeb6b86b4a43168a9f9fbd123a68c1f821e (diff)
downloadfluxbox_pavel-c5b79ed14b350130226a5f978edc8c55caa190a3.zip
fluxbox_pavel-c5b79ed14b350130226a5f978edc8c55caa190a3.tar.bz2
usePixmap from Texture
Diffstat (limited to 'src/ButtonTool.cc')
-rw-r--r--src/ButtonTool.cc7
1 files changed, 3 insertions, 4 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 {