diff options
author | fluxgen <fluxgen> | 2003-08-29 00:48:41 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-08-29 00:48:41 (GMT) |
commit | 8f0b2b2016d0023f928bab973936cf049fe9a30a (patch) | |
tree | 4f9f930159ef6630c6c0ee7579fbe8043abdfec1 /src | |
parent | 76c1bd4b62ed62ffae1f3f6da8dde9716440d87c (diff) | |
download | fluxbox_pavel-8f0b2b2016d0023f928bab973936cf049fe9a30a.zip fluxbox_pavel-8f0b2b2016d0023f928bab973936cf049fe9a30a.tar.bz2 |
minor fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/IconbarTheme.cc | 5 | ||||
-rw-r--r-- | src/ToolTheme.cc | 11 | ||||
-rw-r--r-- | src/ToolTheme.hh | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc index 1c84a78..3c73376 100644 --- a/src/IconbarTheme.cc +++ b/src/IconbarTheme.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: IconbarTheme.cc,v 1.6 2003/08/28 23:51:26 fluxgen Exp $ | 23 | // $Id: IconbarTheme.cc,v 1.7 2003/08/29 00:48:41 fluxgen Exp $ |
24 | 24 | ||
25 | #include "IconbarTheme.hh" | 25 | #include "IconbarTheme.hh" |
26 | #include "FbTk/App.hh" | 26 | #include "FbTk/App.hh" |
@@ -69,6 +69,7 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) { | |||
69 | tmp_item.load(); | 69 | tmp_item.load(); |
70 | // copy texture | 70 | // copy texture |
71 | *m_focused_texture = *tmp_item; | 71 | *m_focused_texture = *tmp_item; |
72 | return true; | ||
72 | } else if (&m_unfocused_texture == &item) { | 73 | } else if (&m_unfocused_texture == &item) { |
73 | // special case for textures since they're using .load() | 74 | // special case for textures since they're using .load() |
74 | FbTk::ThemeItem<FbTk::Texture> tmp_item(m_unfocused_texture.theme(), | 75 | FbTk::ThemeItem<FbTk::Texture> tmp_item(m_unfocused_texture.theme(), |
@@ -76,7 +77,7 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) { | |||
76 | tmp_item.load(); | 77 | tmp_item.load(); |
77 | // copy texture | 78 | // copy texture |
78 | *m_unfocused_texture = *tmp_item; | 79 | *m_unfocused_texture = *tmp_item; |
79 | 80 | return true; | |
80 | } else if (&m_empty_texture == &item) { | 81 | } else if (&m_empty_texture == &item) { |
81 | return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ? | 82 | return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ? |
82 | true : | 83 | true : |
diff --git a/src/ToolTheme.cc b/src/ToolTheme.cc index 77c6ea4..730c9a3 100644 --- a/src/ToolTheme.cc +++ b/src/ToolTheme.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: ToolTheme.cc,v 1.3 2003/08/19 21:27:40 fluxgen Exp $ | 23 | // $Id: ToolTheme.cc,v 1.4 2003/08/29 00:46:18 fluxgen Exp $ |
24 | 24 | ||
25 | #include "ToolTheme.hh" | 25 | #include "ToolTheme.hh" |
26 | 26 | ||
@@ -41,9 +41,12 @@ void ToolTheme::reconfigTheme() { | |||
41 | update(); | 41 | update(); |
42 | } | 42 | } |
43 | 43 | ||
44 | |||
45 | bool ToolTheme::fallback(FbTk::ThemeItem_base &item) { | 44 | bool ToolTheme::fallback(FbTk::ThemeItem_base &item) { |
46 | if (item.name() == "toolbar.workspace") | 45 | if (item.name().find(".justify") != std::string::npos) { |
47 | return FbTk::ThemeManager::instance().loadItem(item, "toolbar.label", "Toolbar.Label"); | 46 | return FbTk::ThemeManager::instance().loadItem(item, |
47 | "toolbar.justify", | ||
48 | "Toolbar.Justify"); | ||
49 | } | ||
50 | |||
48 | return false; | 51 | return false; |
49 | } | 52 | } |
diff --git a/src/ToolTheme.hh b/src/ToolTheme.hh index 3ffe13b..24ae863 100644 --- a/src/ToolTheme.hh +++ b/src/ToolTheme.hh | |||
@@ -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: ToolTheme.hh,v 1.3 2003/08/19 21:27:39 fluxgen Exp $ | 23 | // $Id: ToolTheme.hh,v 1.4 2003/08/29 00:45:41 fluxgen Exp $ |
24 | 24 | ||
25 | #ifndef TOOLTHEME_HH | 25 | #ifndef TOOLTHEME_HH |
26 | #define TOOLTHEME_HH | 26 | #define TOOLTHEME_HH |
@@ -46,6 +46,10 @@ public: | |||
46 | // textures | 46 | // textures |
47 | const FbTk::Texture &texture() const { return *m_texture; } | 47 | const FbTk::Texture &texture() const { return *m_texture; } |
48 | const BorderTheme &border() const { return m_border; } | 48 | const BorderTheme &border() const { return m_border; } |
49 | |||
50 | protected: | ||
51 | FbTk::ThemeItem<FbTk::Texture> &textureTheme() { return m_texture; } | ||
52 | |||
49 | private: | 53 | private: |
50 | FbTk::ThemeItem<FbTk::Texture> m_texture; | 54 | FbTk::ThemeItem<FbTk::Texture> m_texture; |
51 | BorderTheme m_border; | 55 | BorderTheme m_border; |