aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
committerfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
commit35c55cdc8dc0771a07c2276d3190782b89d8a715 (patch)
tree4d0ccaaaf6165453bfe46af0bcc20ed82846041b /src/Window.cc
parent8b560ddf76a0b0256a1c2ffd0cb97d91153e8192 (diff)
downloadfluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.zip
fluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.tar.bz2
moved Texture and Color into new files, fixed some const and pointers
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 0d840e3..9683e5e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.62 2002/07/19 21:35:37 fluxgen Exp $ 25// $Id: Window.cc,v 1.63 2002/07/23 17:11:59 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -609,8 +609,8 @@ void FluxboxWindow::decorate() {
609 tab->decorate(); 609 tab->decorate();
610 610
611 Pixmap tmp = frame.fbutton; 611 Pixmap tmp = frame.fbutton;
612 BTexture *texture = &(screen->getWindowStyle()->b_focus); 612 FbTk::Texture *texture = &(screen->getWindowStyle()->b_focus);
613 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 613 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
614 frame.fbutton = None; 614 frame.fbutton = None;
615 frame.fbutton_pixel = texture->color().pixel(); 615 frame.fbutton_pixel = texture->color().pixel();
616 } else 616 } else
@@ -620,7 +620,7 @@ void FluxboxWindow::decorate() {
620 620
621 tmp = frame.ubutton; 621 tmp = frame.ubutton;
622 texture = &(screen->getWindowStyle()->b_unfocus); 622 texture = &(screen->getWindowStyle()->b_unfocus);
623 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 623 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
624 frame.ubutton = None; 624 frame.ubutton = None;
625 frame.ubutton_pixel = texture->color().pixel(); 625 frame.ubutton_pixel = texture->color().pixel();
626 } else 626 } else
@@ -630,7 +630,7 @@ void FluxboxWindow::decorate() {
630 630
631 tmp = frame.pbutton; 631 tmp = frame.pbutton;
632 texture = &(screen->getWindowStyle()->b_pressed); 632 texture = &(screen->getWindowStyle()->b_pressed);
633 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 633 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
634 frame.pbutton = None; 634 frame.pbutton = None;
635 frame.pbutton_pixel = texture->color().pixel(); 635 frame.pbutton_pixel = texture->color().pixel();
636 } else 636 } else
@@ -641,7 +641,7 @@ void FluxboxWindow::decorate() {
641 if (decorations.titlebar) { 641 if (decorations.titlebar) {
642 tmp = frame.ftitle; 642 tmp = frame.ftitle;
643 texture = &(screen->getWindowStyle()->t_focus); 643 texture = &(screen->getWindowStyle()->t_focus);
644 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 644 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
645 frame.ftitle = None; 645 frame.ftitle = None;
646 frame.ftitle_pixel = texture->color().pixel(); 646 frame.ftitle_pixel = texture->color().pixel();
647 } else 647 } else
@@ -653,7 +653,7 @@ void FluxboxWindow::decorate() {
653 653
654 tmp = frame.utitle; 654 tmp = frame.utitle;
655 texture = &(screen->getWindowStyle()->t_unfocus); 655 texture = &(screen->getWindowStyle()->t_unfocus);
656 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 656 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
657 frame.utitle = None; 657 frame.utitle = None;
658 frame.utitle_pixel = texture->color().pixel(); 658 frame.utitle_pixel = texture->color().pixel();
659 } else 659 } else
@@ -676,7 +676,7 @@ void FluxboxWindow::decorate() {
676 if (decorations.handle) { 676 if (decorations.handle) {
677 tmp = frame.fhandle; 677 tmp = frame.fhandle;
678 texture = &(screen->getWindowStyle()->h_focus); 678 texture = &(screen->getWindowStyle()->h_focus);
679 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 679 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
680 frame.fhandle = None; 680 frame.fhandle = None;
681 frame.fhandle_pixel = texture->color().pixel(); 681 frame.fhandle_pixel = texture->color().pixel();
682 } else 682 } else
@@ -686,7 +686,7 @@ void FluxboxWindow::decorate() {
686 686
687 tmp = frame.uhandle; 687 tmp = frame.uhandle;
688 texture = &(screen->getWindowStyle()->h_unfocus); 688 texture = &(screen->getWindowStyle()->h_unfocus);
689 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 689 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
690 frame.uhandle = None; 690 frame.uhandle = None;
691 frame.uhandle_pixel = texture->color().pixel(); 691 frame.uhandle_pixel = texture->color().pixel();
692 } else 692 } else
@@ -697,7 +697,7 @@ void FluxboxWindow::decorate() {
697 697
698 tmp = frame.fgrip; 698 tmp = frame.fgrip;
699 texture = &(screen->getWindowStyle()->g_focus); 699 texture = &(screen->getWindowStyle()->g_focus);
700 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 700 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
701 frame.fgrip = None; 701 frame.fgrip = None;
702 frame.fgrip_pixel = texture->color().pixel(); 702 frame.fgrip_pixel = texture->color().pixel();
703 } else 703 } else
@@ -708,7 +708,7 @@ void FluxboxWindow::decorate() {
708 708
709 tmp = frame.ugrip; 709 tmp = frame.ugrip;
710 texture = &(screen->getWindowStyle()->g_unfocus); 710 texture = &(screen->getWindowStyle()->g_unfocus);
711 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 711 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
712 frame.ugrip = None; 712 frame.ugrip = None;
713 frame.ugrip_pixel = texture->color().pixel(); 713 frame.ugrip_pixel = texture->color().pixel();
714 } else 714 } else
@@ -731,8 +731,8 @@ void FluxboxWindow::decorate() {
731 731
732void FluxboxWindow::decorateLabel() { 732void FluxboxWindow::decorateLabel() {
733 Pixmap tmp = frame.flabel; 733 Pixmap tmp = frame.flabel;
734 BTexture *texture = &(screen->getWindowStyle()->l_focus); 734 FbTk::Texture *texture = &(screen->getWindowStyle()->l_focus);
735 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 735 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
736 frame.flabel = None; 736 frame.flabel = None;
737 frame.flabel_pixel = texture->color().pixel(); 737 frame.flabel_pixel = texture->color().pixel();
738 } else 738 } else
@@ -742,7 +742,7 @@ void FluxboxWindow::decorateLabel() {
742 742
743 tmp = frame.ulabel; 743 tmp = frame.ulabel;
744 texture = &(screen->getWindowStyle()->l_unfocus); 744 texture = &(screen->getWindowStyle()->l_unfocus);
745 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) { 745 if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
746 frame.ulabel = None; 746 frame.ulabel = None;
747 frame.ulabel_pixel = texture->color().pixel(); 747 frame.ulabel_pixel = texture->color().pixel();
748 } else 748 } else