aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-09-12 23:33:13 (GMT)
committerfluxgen <fluxgen>2003-09-12 23:33:13 (GMT)
commit7e320b7d315a5ae1acf75c0d685731aaa6c2b296 (patch)
tree578997ccba5348f97d38af09ed93cb3e363b4cd1
parent5aae53172bad9dff1a1d2abb44819bcf81876129 (diff)
downloadfluxbox-7e320b7d315a5ae1acf75c0d685731aaa6c2b296.zip
fluxbox-7e320b7d315a5ae1acf75c0d685731aaa6c2b296.tar.bz2
removed bevel width and handle width
-rw-r--r--src/RootTheme.cc12
-rw-r--r--src/RootTheme.hh6
2 files changed, 2 insertions, 16 deletions
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 6e489e1..15723ac 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.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: RootTheme.cc,v 1.5 2003/09/12 21:34:22 fluxgen Exp $ 22// $Id: RootTheme.cc,v 1.6 2003/09/12 23:33:13 fluxgen Exp $
23 23
24#include "RootTheme.hh" 24#include "RootTheme.hh"
25 25
@@ -29,13 +29,9 @@
29RootTheme::RootTheme(int screen_num, std::string &screen_root_command): 29RootTheme::RootTheme(int screen_num, std::string &screen_root_command):
30 FbTk::Theme(screen_num), 30 FbTk::Theme(screen_num),
31 m_root_command(*this, "rootCommand", "RootCommand"), 31 m_root_command(*this, "rootCommand", "RootCommand"),
32 m_bevel_width(*this, "bevelWidth", "BevelWidth"),
33 m_handle_width(*this, "handleWidth", "HandleWidth"),
34 m_screen_root_command(screen_root_command), 32 m_screen_root_command(screen_root_command),
35 m_opgc(RootWindow(FbTk::App::instance()->display(), screen_num)) { 33 m_opgc(RootWindow(FbTk::App::instance()->display(), screen_num)) {
36 34
37 *m_bevel_width = 0;
38 *m_handle_width = 0;
39 Display *disp = FbTk::App::instance()->display(); 35 Display *disp = FbTk::App::instance()->display();
40 m_opgc.setForeground(WhitePixel(disp, screen_num)^BlackPixel(disp, screen_num)); 36 m_opgc.setForeground(WhitePixel(disp, screen_num)^BlackPixel(disp, screen_num));
41 m_opgc.setFunction(GXxor); 37 m_opgc.setFunction(GXxor);
@@ -47,12 +43,6 @@ RootTheme::~RootTheme() {
47} 43}
48 44
49void RootTheme::reconfigTheme() { 45void RootTheme::reconfigTheme() {
50 if (*m_bevel_width > 20)
51 *m_bevel_width = 20;
52
53 if (*m_handle_width > 20)
54 *m_handle_width = 20;
55
56 // override resource root command? 46 // override resource root command?
57 if (m_screen_root_command == "") { 47 if (m_screen_root_command == "") {
58 // do root command 48 // do root command
diff --git a/src/RootTheme.hh b/src/RootTheme.hh
index a23e439..3f12358 100644
--- a/src/RootTheme.hh
+++ b/src/RootTheme.hh
@@ -19,13 +19,12 @@
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: RootTheme.hh,v 1.4 2003/09/12 21:34:22 fluxgen Exp $ 22// $Id: RootTheme.hh,v 1.5 2003/09/12 23:33:13 fluxgen Exp $
23 23
24#ifndef ROOTTHEME_HH 24#ifndef ROOTTHEME_HH
25#define ROOTTHEME_HH 25#define ROOTTHEME_HH
26 26
27#include "FbTk/Theme.hh" 27#include "FbTk/Theme.hh"
28#include "FbTk/Color.hh"
29#include "FbTk/GContext.hh" 28#include "FbTk/GContext.hh"
30 29
31#include <X11/Xlib.h> 30#include <X11/Xlib.h>
@@ -44,13 +43,10 @@ public:
44 43
45 void reconfigTheme(); 44 void reconfigTheme();
46 45
47 int bevelWidth() const { return *m_bevel_width; }
48 int handleWidth() const { return *m_handle_width; }
49 GC opGC() const { return m_opgc.gc(); } 46 GC opGC() const { return m_opgc.gc(); }
50 47
51private: 48private:
52 FbTk::ThemeItem<std::string> m_root_command; 49 FbTk::ThemeItem<std::string> m_root_command;
53 FbTk::ThemeItem<int> m_bevel_width, m_handle_width;
54 std::string &m_screen_root_command; ///< string to execute and override theme rootCommand 50 std::string &m_screen_root_command; ///< string to execute and override theme rootCommand
55 FbTk::GContext m_opgc; 51 FbTk::GContext m_opgc;
56}; 52};