summaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Window.cc b/src/Window.cc
index a99c9a6..6cccec7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -707,7 +707,7 @@ void FluxboxWindow::decorate(void) {
707 707
708 Pixmap tmp = frame.fbutton; 708 Pixmap tmp = frame.fbutton;
709 BTexture *texture = &(screen->getWindowStyle()->b_focus); 709 BTexture *texture = &(screen->getWindowStyle()->b_focus);
710 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 710 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
711 frame.fbutton = None; 711 frame.fbutton = None;
712 frame.fbutton_pixel = texture->getColor()->getPixel(); 712 frame.fbutton_pixel = texture->getColor()->getPixel();
713 } else 713 } else
@@ -717,7 +717,7 @@ void FluxboxWindow::decorate(void) {
717 717
718 tmp = frame.ubutton; 718 tmp = frame.ubutton;
719 texture = &(screen->getWindowStyle()->b_unfocus); 719 texture = &(screen->getWindowStyle()->b_unfocus);
720 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 720 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
721 frame.ubutton = None; 721 frame.ubutton = None;
722 frame.ubutton_pixel = texture->getColor()->getPixel(); 722 frame.ubutton_pixel = texture->getColor()->getPixel();
723 } else 723 } else
@@ -727,7 +727,7 @@ void FluxboxWindow::decorate(void) {
727 727
728 tmp = frame.pbutton; 728 tmp = frame.pbutton;
729 texture = &(screen->getWindowStyle()->b_pressed); 729 texture = &(screen->getWindowStyle()->b_pressed);
730 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 730 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
731 frame.pbutton = None; 731 frame.pbutton = None;
732 frame.pbutton_pixel = texture->getColor()->getPixel(); 732 frame.pbutton_pixel = texture->getColor()->getPixel();
733 } else 733 } else
@@ -738,7 +738,7 @@ void FluxboxWindow::decorate(void) {
738 if (decorations.titlebar) { 738 if (decorations.titlebar) {
739 tmp = frame.ftitle; 739 tmp = frame.ftitle;
740 texture = &(screen->getWindowStyle()->t_focus); 740 texture = &(screen->getWindowStyle()->t_focus);
741 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 741 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
742 frame.ftitle = None; 742 frame.ftitle = None;
743 frame.ftitle_pixel = texture->getColor()->getPixel(); 743 frame.ftitle_pixel = texture->getColor()->getPixel();
744 } else 744 } else
@@ -750,7 +750,7 @@ void FluxboxWindow::decorate(void) {
750 750
751 tmp = frame.utitle; 751 tmp = frame.utitle;
752 texture = &(screen->getWindowStyle()->t_unfocus); 752 texture = &(screen->getWindowStyle()->t_unfocus);
753 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 753 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
754 frame.utitle = None; 754 frame.utitle = None;
755 frame.utitle_pixel = texture->getColor()->getPixel(); 755 frame.utitle_pixel = texture->getColor()->getPixel();
756 } else 756 } else
@@ -773,7 +773,7 @@ void FluxboxWindow::decorate(void) {
773 if (decorations.handle) { 773 if (decorations.handle) {
774 tmp = frame.fhandle; 774 tmp = frame.fhandle;
775 texture = &(screen->getWindowStyle()->h_focus); 775 texture = &(screen->getWindowStyle()->h_focus);
776 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 776 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
777 frame.fhandle = None; 777 frame.fhandle = None;
778 frame.fhandle_pixel = texture->getColor()->getPixel(); 778 frame.fhandle_pixel = texture->getColor()->getPixel();
779 } else 779 } else
@@ -783,7 +783,7 @@ void FluxboxWindow::decorate(void) {
783 783
784 tmp = frame.uhandle; 784 tmp = frame.uhandle;
785 texture = &(screen->getWindowStyle()->h_unfocus); 785 texture = &(screen->getWindowStyle()->h_unfocus);
786 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 786 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
787 frame.uhandle = None; 787 frame.uhandle = None;
788 frame.uhandle_pixel = texture->getColor()->getPixel(); 788 frame.uhandle_pixel = texture->getColor()->getPixel();
789 } else 789 } else
@@ -794,7 +794,7 @@ void FluxboxWindow::decorate(void) {
794 794
795 tmp = frame.fgrip; 795 tmp = frame.fgrip;
796 texture = &(screen->getWindowStyle()->g_focus); 796 texture = &(screen->getWindowStyle()->g_focus);
797 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 797 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
798 frame.fgrip = None; 798 frame.fgrip = None;
799 frame.fgrip_pixel = texture->getColor()->getPixel(); 799 frame.fgrip_pixel = texture->getColor()->getPixel();
800 } else 800 } else
@@ -805,7 +805,7 @@ void FluxboxWindow::decorate(void) {
805 805
806 tmp = frame.ugrip; 806 tmp = frame.ugrip;
807 texture = &(screen->getWindowStyle()->g_unfocus); 807 texture = &(screen->getWindowStyle()->g_unfocus);
808 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 808 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
809 frame.ugrip = None; 809 frame.ugrip = None;
810 frame.ugrip_pixel = texture->getColor()->getPixel(); 810 frame.ugrip_pixel = texture->getColor()->getPixel();
811 } else 811 } else
@@ -829,7 +829,7 @@ void FluxboxWindow::decorate(void) {
829void FluxboxWindow::decorateLabel(void) { 829void FluxboxWindow::decorateLabel(void) {
830 Pixmap tmp = frame.flabel; 830 Pixmap tmp = frame.flabel;
831 BTexture *texture = &(screen->getWindowStyle()->l_focus); 831 BTexture *texture = &(screen->getWindowStyle()->l_focus);
832 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 832 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
833 frame.flabel = None; 833 frame.flabel = None;
834 frame.flabel_pixel = texture->getColor()->getPixel(); 834 frame.flabel_pixel = texture->getColor()->getPixel();
835 } else 835 } else
@@ -839,7 +839,7 @@ void FluxboxWindow::decorateLabel(void) {
839 839
840 tmp = frame.ulabel; 840 tmp = frame.ulabel;
841 texture = &(screen->getWindowStyle()->l_unfocus); 841 texture = &(screen->getWindowStyle()->l_unfocus);
842 if (texture->getTexture() == (BImage_Flat | BImage_Solid)) { 842 if (texture->getTexture() == (BImage::FLAT | BImage::SOLID)) {
843 frame.ulabel = None; 843 frame.ulabel = None;
844 frame.ulabel_pixel = texture->getColor()->getPixel(); 844 frame.ulabel_pixel = texture->getColor()->getPixel();
845 } else 845 } else