aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-23 18:38:31 (GMT)
committerfluxgen <fluxgen>2002-07-23 18:38:31 (GMT)
commit7f6880bbac9ffec3b6221eb04e0977b9a9c669b7 (patch)
tree78b170c869d5aa21df2751b1a5d49fb987cbd444 /src/Theme.cc
parent47d27a0bab8d6585d3031b7945c7ee6718f8d228 (diff)
downloadfluxbox-7f6880bbac9ffec3b6221eb04e0977b9a9c669b7.zip
fluxbox-7f6880bbac9ffec3b6221eb04e0977b9a9c669b7.tar.bz2
slit theme, which falls back on toolbar theme if it does not exist
Diffstat (limited to 'src/Theme.cc')
-rw-r--r--src/Theme.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index 552cf8c..89db396 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -41,7 +41,7 @@
41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
42// DEALINGS IN THE SOFTWARE. 42// DEALINGS IN THE SOFTWARE.
43 43
44// $Id: Theme.cc,v 1.23 2002/07/23 17:11:59 fluxgen Exp $ 44// $Id: Theme.cc,v 1.24 2002/07/23 18:38:31 fluxgen Exp $
45 45
46#ifndef _GNU_SOURCE 46#ifndef _GNU_SOURCE
47#define _GNU_SOURCE 47#define _GNU_SOURCE
@@ -286,7 +286,7 @@ void Theme::load(const char *filename){
286 m_database = XrmGetFileDatabase(DEFAULTSTYLE); 286 m_database = XrmGetFileDatabase(DEFAULTSTYLE);
287 287
288 loadMenuStyle(); 288 loadMenuStyle();
289 loadToolbarStyle(); 289 loadToolbarStyle();
290 loadWindowStyle(); 290 loadWindowStyle();
291 loadTabStyle(); 291 loadTabStyle();
292 loadRootCommand(); 292 loadRootCommand();
@@ -665,7 +665,7 @@ void Theme::loadRootCommand() {
665 665
666} 666}
667 667
668void Theme::loadMisc(void) { 668void Theme::loadMisc() {
669 unsigned int screen_width_div2 = WidthOfScreen(ScreenOfDisplay(m_display, m_screennum)) / 2; 669 unsigned int screen_width_div2 = WidthOfScreen(ScreenOfDisplay(m_display, m_screennum)) / 2;
670 XrmValue value; 670 XrmValue value;
671 char *value_type=0; 671 char *value_type=0;
@@ -705,6 +705,14 @@ void Theme::loadMisc(void) {
705 705
706 readDatabaseColor("borderColor", "BorderColor", &m_border_color, 706 readDatabaseColor("borderColor", "BorderColor", &m_border_color,
707 BlackPixel(m_display, m_screennum)); 707 BlackPixel(m_display, m_screennum));
708
709 // load slit style, if it wasn't found fall back to toolbarstyle
710 if (!readDatabaseTexture("slit", "Slit",
711 &m_slit_texture,
712 BlackPixel(m_display, m_screennum)) ) {
713 m_slit_texture = m_toolbarstyle.toolbar;
714 }
715
708} 716}
709 717
710 718
@@ -807,7 +815,7 @@ bool Theme::readDatabaseTexture(char *rname, char *rclass,
807 } 815 }
808 816
809 if (!retval) 817 if (!retval)
810 fprintf(stderr, "Faild in readTexture\n"); 818 cerr<<"Failed to load texture for: "<<rname<<endl;
811 819
812 return retval; 820 return retval;
813} 821}