M src/IconbarTheme.cc → src/IconbarTheme.cc

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconbarTheme.cc,v 1.6 2003/08/28 23:51:26 fluxgen Exp $
+// $Id: IconbarTheme.cc,v 1.7 2003/08/29 00:48:41 fluxgen Exp $
 
 #include "IconbarTheme.hh"
 #include "FbTk/App.hh"
@@ -69,6 +69,7 @@ "window.label.focus", "Window.Title.Focus");
         tmp_item.load();
         // copy texture
         *m_focused_texture = *tmp_item;
+        return true;
     } else if (&m_unfocused_texture == &item) {
         // special case for textures since they're using .load()
         FbTk::ThemeItem<FbTk::Texture> tmp_item(m_unfocused_texture.theme(),
@@ -76,7 +77,7 @@ "window.label.unfocus", "Window.Label.Unfocus");
         tmp_item.load();
         // copy texture
         *m_unfocused_texture = *tmp_item;
-
+        return true;
     } else if (&m_empty_texture == &item) {
         return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ? 
                 true : 

M src/ToolTheme.cc → src/ToolTheme.cc

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolTheme.cc,v 1.3 2003/08/19 21:27:40 fluxgen Exp $
+// $Id: ToolTheme.cc,v 1.4 2003/08/29 00:46:18 fluxgen Exp $
 
 #include "ToolTheme.hh"
 
@@ -41,9 +41,12 @@ // update text theme
     update();
 }
 
+bool ToolTheme::fallback(FbTk::ThemeItem_base &item) {
+    if (item.name().find(".justify") != std::string::npos) {
+        return FbTk::ThemeManager::instance().loadItem(item, 
+                                                       "toolbar.justify",
+                                                       "Toolbar.Justify");
+    }
 
-bool ToolTheme::fallback(FbTk::ThemeItem_base &item) {
-    if (item.name() == "toolbar.workspace")
-        return FbTk::ThemeManager::instance().loadItem(item, "toolbar.label", "Toolbar.Label");
     return false;
 }

M src/ToolTheme.hh → src/ToolTheme.hh

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolTheme.hh,v 1.3 2003/08/19 21:27:39 fluxgen Exp $
+// $Id: ToolTheme.hh,v 1.4 2003/08/29 00:45:41 fluxgen Exp $
 
 #ifndef TOOLTHEME_HH
 #define TOOLTHEME_HH
@@ -46,6 +46,10 @@ void reconfigTheme();
     // textures
     const FbTk::Texture &texture() const { return *m_texture; }
     const BorderTheme &border() const { return m_border; }
+
+protected:
+    FbTk::ThemeItem<FbTk::Texture> &textureTheme() { return m_texture; }
+
 private:
     FbTk::ThemeItem<FbTk::Texture> m_texture;
     BorderTheme m_border;