fixed fallback items
This commit is contained in:
parent
46ea237c38
commit
be89656dea
2 changed files with 39 additions and 3 deletions
|
@ -20,7 +20,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: IconbarTheme.cc,v 1.4 2003/08/13 10:03:06 fluxgen Exp $
|
// $Id: IconbarTheme.cc,v 1.5 2003/08/19 21:26:45 fluxgen Exp $
|
||||||
|
|
||||||
#include "IconbarTheme.hh"
|
#include "IconbarTheme.hh"
|
||||||
#include "FbTk/App.hh"
|
#include "FbTk/App.hh"
|
||||||
|
@ -36,7 +36,8 @@ IconbarTheme::IconbarTheme(int screen_num,
|
||||||
m_unfocused_border(*this, name + ".unfocused", altname + ".Unfocused"),
|
m_unfocused_border(*this, name + ".unfocused", altname + ".Unfocused"),
|
||||||
m_border(*this, name, altname),
|
m_border(*this, name, altname),
|
||||||
m_focused_text(*this, name + ".focused", altname + ".Focused"),
|
m_focused_text(*this, name + ".focused", altname + ".Focused"),
|
||||||
m_unfocused_text(*this, name + ".unfocused", altname + ".Unfocused") {
|
m_unfocused_text(*this, name + ".unfocused", altname + ".Unfocused"),
|
||||||
|
m_name(name) {
|
||||||
|
|
||||||
FbTk::ThemeManager::instance().loadTheme(*this);
|
FbTk::ThemeManager::instance().loadTheme(*this);
|
||||||
|
|
||||||
|
@ -56,3 +57,36 @@ void IconbarTheme::setAntialias(bool value) {
|
||||||
m_unfocused_text.setAntialias(value);
|
m_unfocused_text.setAntialias(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// fallback resources
|
||||||
|
bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
|
||||||
|
using namespace FbTk;
|
||||||
|
ThemeManager &tm = ThemeManager::instance();
|
||||||
|
|
||||||
|
if (&m_focused_texture == &item)
|
||||||
|
return tm.loadItem(item, "window.title.focus", "Window.Title.Focus");
|
||||||
|
else if (&m_unfocused_texture == &item) {
|
||||||
|
return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ?
|
||||||
|
true :
|
||||||
|
tm.loadItem(item, "window.title.unfocus", "Window.Title.Unfocus"));
|
||||||
|
} else if (&m_empty_texture == &item) {
|
||||||
|
return (tm.loadItem(item, m_focused_texture.name(), m_focused_texture.altName()) ?
|
||||||
|
true :
|
||||||
|
tm.loadItem(item, "toolbar.windowLabel", "toolbar.windowLabel"));
|
||||||
|
} else if (item.name() == m_name + ".borderWidth" ||
|
||||||
|
item.name() == m_name + ".focused.borderWidth" ||
|
||||||
|
item.name() == m_name + ".unfocused.borderWidth")
|
||||||
|
return tm.loadItem(item, "borderWidth", "BorderWidth");
|
||||||
|
else if (item.name() == m_name + ".borderColor" ||
|
||||||
|
item.name() == m_name + ".focused.borderColor" ||
|
||||||
|
item.name() == m_name + ".unfocused.borderColor")
|
||||||
|
return tm.loadItem(item, "borderColor", "BorderColor");
|
||||||
|
else if (item.name() == m_name + ".focused.font" ||
|
||||||
|
item.name() == m_name + ".unfocused.font")
|
||||||
|
return tm.loadItem(item, "window.font", "Window.Font");
|
||||||
|
else if (item.name() == m_name + ".focused.textColor")
|
||||||
|
return tm.loadItem(item, "window.label.focus.textColor", "Window.Label.Focus.TextColor");
|
||||||
|
else if (item.name() == m_name + ".unfocused.textColor")
|
||||||
|
return tm.loadItem(item, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor");
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: IconbarTheme.hh,v 1.4 2003/08/13 10:03:06 fluxgen Exp $
|
// $Id: IconbarTheme.hh,v 1.5 2003/08/19 21:26:45 fluxgen Exp $
|
||||||
|
|
||||||
#ifndef ICONBARTHEME_HH
|
#ifndef ICONBARTHEME_HH
|
||||||
#define ICONBARTHEME_HH
|
#define ICONBARTHEME_HH
|
||||||
|
@ -37,6 +37,7 @@ public:
|
||||||
virtual ~IconbarTheme();
|
virtual ~IconbarTheme();
|
||||||
|
|
||||||
void reconfigTheme();
|
void reconfigTheme();
|
||||||
|
bool fallback(FbTk::ThemeItem_base &item);
|
||||||
|
|
||||||
void setAntialias(bool antialias);
|
void setAntialias(bool antialias);
|
||||||
|
|
||||||
|
@ -55,6 +56,7 @@ private:
|
||||||
FbTk::ThemeItem<FbTk::Texture> m_focused_texture, m_unfocused_texture, m_empty_texture;
|
FbTk::ThemeItem<FbTk::Texture> m_focused_texture, m_unfocused_texture, m_empty_texture;
|
||||||
BorderTheme m_focused_border, m_unfocused_border, m_border;
|
BorderTheme m_focused_border, m_unfocused_border, m_border;
|
||||||
TextTheme m_focused_text, m_unfocused_text;
|
TextTheme m_focused_text, m_unfocused_text;
|
||||||
|
std::string m_name;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ICONBARTHEME_HH
|
#endif // ICONBARTHEME_HH
|
||||||
|
|
Loading…
Reference in a new issue