nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fixes

Browse source
This commit is contained in:
fluxgen 2003-08-29 00:48:41 +00:00
parent 76c1bd4b62
commit 8f0b2b2016
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/IconbarTheme.cc
View file

@ -20,7 +20,7 @@
// 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 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
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 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
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 :

11
src/ToolTheme.cc
View file

@ -20,7 +20,7 @@
// 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 @@ void ToolTheme::reconfigTheme() {
update();
}
bool ToolTheme::fallback(FbTk::ThemeItem_base &item) {
if (item.name() == "toolbar.workspace")
return FbTk::ThemeManager::instance().loadItem(item, "toolbar.label", "Toolbar.Label");
if (item.name().find(".justify") != std::string::npos) {
return FbTk::ThemeManager::instance().loadItem(item,
"toolbar.justify",
"Toolbar.Justify");
}
return false;
}

6
src/ToolTheme.hh
View file

@ -20,7 +20,7 @@
// 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 @@ public:
// 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;