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

added window.handleWidth and window.bevelWidth

Browse source
This commit is contained in:
fluxgen 2003-09-12 23:37:12 +00:00
parent 4c1c1267b6
commit c136741213
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/FbWinFrameTheme.cc
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: FbWinFrameTheme.cc,v 1.11 2003/08/27 17:52:08 fluxgen Exp $
// $Id: FbWinFrameTheme.cc,v 1.12 2003/09/12 23:37:12 fluxgen Exp $
#include "FbWinFrameTheme.hh"
#include "App.hh"
@ -58,9 +58,10 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
m_font(*this, "window.font", "Window.Font"),
m_textjustify(*this, "window.justify", "Window.Justify"),
m_shape_place(*this, "window.roundCorners", "Window.RoundCorners"),
m_alpha(*this, "window.alpha", "Window.Alpha"),
m_title_height(*this, "window.title.height", "Window.Title.Height"),
m_bevel_width(*this, "window.bevelWidth", "Window.BevelWidth"),
m_handle_width(*this, "window.handleWidth", "Window.handleWidth"),
m_border(*this, "window", "Window"), // for window.border*
m_label_text_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
m_label_text_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
@ -89,6 +90,10 @@ bool FbWinFrameTheme::fallback(FbTk::ThemeItem_base &item) {
return FbTk::ThemeManager::instance().loadItem(item, "borderWidth", "BorderWidth");
else if (item.name() == "window.borderColor")
return FbTk::ThemeManager::instance().loadItem(item, "borderColor", "BorderColor");
else if (item.name() == "window.bevelWidth")
return FbTk::ThemeManager::instance().loadItem(item, "bevelWidth", "bevelWidth");
else if (item.name() == "window.handleWidth")
return FbTk::ThemeManager::instance().loadItem(item, "handleWidth", "HandleWidth");
return false;
}
@ -99,6 +104,16 @@ void FbWinFrameTheme::reconfigTheme() {
else if (*m_alpha < 0)
*m_alpha = 0;
if (*m_bevel_width > 20)
*m_bevel_width = 20;
else if (*m_bevel_width < 0)
*m_bevel_width = 0;
if (*m_handle_width > 200)
*m_handle_width = 200;
else if (*m_handle_width < 0)
*m_handle_width = 1;
m_label_text_focus_gc.setForeground(*m_label_focus_color);
m_label_text_unfocus_gc.setForeground(*m_label_unfocus_color);
m_button_pic_focus_gc.setForeground(*m_button_focus_color);

7
src/FbWinFrameTheme.hh
View file

@ -19,7 +19,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: FbWinFrameTheme.hh,v 1.10 2003/08/27 17:52:08 fluxgen Exp $
// $Id: FbWinFrameTheme.hh,v 1.11 2003/09/12 23:37:12 fluxgen Exp $
#ifndef FBWINFRAMETHEME_HH
#define FBWINFRAMETHEME_HH
@ -96,6 +96,9 @@ public:
unsigned char alpha() const { return *m_alpha; }
unsigned int titleHeight() const { return *m_title_height; }
unsigned int bevelWidth() const { return *m_bevel_width; }
unsigned int handleWidth() const { return *m_handle_width; }
private:
FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus;
FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
@ -111,7 +114,7 @@ private:
FbTk::ThemeItem<FbTk::Justify> m_textjustify;
FbTk::ThemeItem<Shape::ShapePlace> m_shape_place;
FbTk::ThemeItem<int> m_alpha, m_title_height;
FbTk::ThemeItem<int> m_alpha, m_title_height, m_bevel_width, m_handle_width;
BorderTheme m_border;
FbTk::GContext m_label_text_focus_gc, m_label_text_unfocus_gc;