summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-24 19:06:06 (GMT)
committerfluxgen <fluxgen>2002-08-24 19:06:06 (GMT)
commit5ac4d4bcff5fdaabdfe29135c93016c8067dc5b2 (patch)
treeed24d6db0bcfef304f4bf9bb04ea4bacbd3efb4b
parent84cd0f3a891f82de691acced030f7de8058ddbbf (diff)
downloadfluxbox_lack-5ac4d4bcff5fdaabdfe29135c93016c8067dc5b2.zip
fluxbox_lack-5ac4d4bcff5fdaabdfe29135c93016c8067dc5b2.tar.bz2
fixed parent relative issue
-rw-r--r--src/Theme.cc30
1 files changed, 26 insertions, 4 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index dd5b561..d7d24ed 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.25 2002/08/04 15:41:26 fluxgen Exp $ 44// $Id: Theme.cc,v 1.26 2002/08/24 19:06:06 fluxgen Exp $
45 45
46#ifndef _GNU_SOURCE 46#ifndef _GNU_SOURCE
47#define _GNU_SOURCE 47#define _GNU_SOURCE
@@ -382,27 +382,46 @@ void Theme::loadMenuStyle() {
382 382
383void Theme::loadWindowStyle() { 383void Theme::loadWindowStyle() {
384 384
385 //read textures
386
385 readDatabaseTexture("window.title.focus", "Window.Title.Focus", 387 readDatabaseTexture("window.title.focus", "Window.Title.Focus",
386 &m_windowstyle.t_focus, 388 &m_windowstyle.t_focus,
387 WhitePixel(m_display, m_screennum)); 389 WhitePixel(m_display, m_screennum));
390 if ( (m_windowstyle.t_focus.type() & FbTk::Texture::PARENTRELATIVE) ) {
391 cerr<<"Warning: window.title.focus type is ParentRelative. Using flat solid!"<<endl;
392 m_windowstyle.t_focus.setType(FbTk::Texture::FLAT|FbTk::Texture::SOLID);
393 }
388 readDatabaseTexture("window.title.unfocus", "Window.Title.Unfocus", 394 readDatabaseTexture("window.title.unfocus", "Window.Title.Unfocus",
389 &m_windowstyle.t_unfocus, 395 &m_windowstyle.t_unfocus,
390 BlackPixel(m_display, m_screennum)); 396 BlackPixel(m_display, m_screennum));
397 if ( (m_windowstyle.t_unfocus.type() & FbTk::Texture::PARENTRELATIVE) ) {
398 cerr<<"Warning: window.title.unfocus type is ParentRelative. Using flat solid!"<<endl;
399 m_windowstyle.t_unfocus.setType(FbTk::Texture::FLAT|FbTk::Texture::SOLID);
400 }
401
391 readDatabaseTexture("window.label.focus", "Window.Label.Focus", 402 readDatabaseTexture("window.label.focus", "Window.Label.Focus",
392 &m_windowstyle.l_focus, 403 &m_windowstyle.l_focus,
393 WhitePixel(m_display, m_screennum)); 404 WhitePixel(m_display, m_screennum));
394
395 readDatabaseTexture("window.label.unfocus", "Window.Label.Unfocus", 405 readDatabaseTexture("window.label.unfocus", "Window.Label.Unfocus",
396 &m_windowstyle.l_unfocus, 406 &m_windowstyle.l_unfocus,
397 BlackPixel(m_display, m_screennum)); 407 BlackPixel(m_display, m_screennum));
398 408
399 409
400 readDatabaseTexture("window.handle.focus", "Window.Handle.Focus", 410 readDatabaseTexture("window.handle.focus", "Window.Handle.Focus",
401 &m_windowstyle.h_focus, 411 &m_windowstyle.h_focus,
402 WhitePixel(m_display, m_screennum)); 412 WhitePixel(m_display, m_screennum));
413 if ( (m_windowstyle.h_focus.type() & FbTk::Texture::PARENTRELATIVE) ) {
414 cerr<<"Warning: window.handle.focus is ParentReleative. Using flat solid instead."<<endl;
415 m_windowstyle.h_focus.setType(FbTk::Texture::FLAT|FbTk::Texture::SOLID);
416 }
403 readDatabaseTexture("window.handle.unfocus", "Window.Handle.Unfocus", 417 readDatabaseTexture("window.handle.unfocus", "Window.Handle.Unfocus",
404 &m_windowstyle.h_unfocus, 418 &m_windowstyle.h_unfocus,
405 BlackPixel(m_display, m_screennum)); 419 BlackPixel(m_display, m_screennum));
420 if ( (m_windowstyle.h_unfocus.type() & FbTk::Texture::PARENTRELATIVE) ) {
421 cerr<<"Warning: window.handle.unfocus is ParentReleative. Using flat solid instead."<<endl;
422 m_windowstyle.h_unfocus.setType(FbTk::Texture::FLAT|FbTk::Texture::SOLID);
423 }
424
406 readDatabaseTexture("window.grip.focus", "Window.Grip.Focus", 425 readDatabaseTexture("window.grip.focus", "Window.Grip.Focus",
407 &m_windowstyle.g_focus, 426 &m_windowstyle.g_focus,
408 WhitePixel(m_display, m_screennum)); 427 WhitePixel(m_display, m_screennum));
@@ -418,6 +437,9 @@ void Theme::loadWindowStyle() {
418 readDatabaseTexture("window.button.pressed", "Window.Button.Pressed", 437 readDatabaseTexture("window.button.pressed", "Window.Button.Pressed",
419 &m_windowstyle.b_pressed, 438 &m_windowstyle.b_pressed,
420 BlackPixel(m_display, m_screennum)); 439 BlackPixel(m_display, m_screennum));
440
441 // read colors
442
421 readDatabaseColor("window.frame.focusColor", 443 readDatabaseColor("window.frame.focusColor",
422 "Window.Frame.FocusColor", 444 "Window.Frame.FocusColor",
423 &m_windowstyle.f_focus, 445 &m_windowstyle.f_focus,