diff options
author | fluxgen <fluxgen> | 2002-11-27 21:58:35 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-11-27 21:58:35 (GMT) |
commit | f04a97d20077bdb60adb1fb9d0a6df1a268af84e (patch) | |
tree | 31358fc3f18dc8d1fbdddcec370d1a0a21fe3a29 /src | |
parent | 43c4469119b5b5357d01e59a23cf541fb233bd28 (diff) | |
download | fluxbox-f04a97d20077bdb60adb1fb9d0a6df1a268af84e.zip fluxbox-f04a97d20077bdb60adb1fb9d0a6df1a268af84e.tar.bz2 |
texture passed as const referens to BImageControl's renderImage
Diffstat (limited to 'src')
-rw-r--r-- | src/Window.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Window.cc b/src/Window.cc index f0a64bb..0a5c614 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.103 2002/11/27 14:00:44 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.104 2002/11/27 21:58:35 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -580,13 +580,13 @@ void FluxboxWindow::decorate() { | |||
580 | tab->decorate(); | 580 | tab->decorate(); |
581 | 581 | ||
582 | Pixmap tmp = frame.fbutton; | 582 | Pixmap tmp = frame.fbutton; |
583 | FbTk::Texture *texture = &(screen->getWindowStyle()->b_focus); | 583 | const FbTk::Texture *texture = &(screen->getWindowStyle()->b_focus); |
584 | if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { | 584 | if (texture->type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { |
585 | frame.fbutton = None; | 585 | frame.fbutton = None; |
586 | frame.fbutton_pixel = texture->color().pixel(); | 586 | frame.fbutton_pixel = texture->color().pixel(); |
587 | } else | 587 | } else |
588 | frame.fbutton = | 588 | frame.fbutton = |
589 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); | 589 | image_ctrl->renderImage(frame.button_w, frame.button_h, *texture); |
590 | if (tmp) image_ctrl->removeImage(tmp); | 590 | if (tmp) image_ctrl->removeImage(tmp); |
591 | 591 | ||
592 | tmp = frame.ubutton; | 592 | tmp = frame.ubutton; |
@@ -596,7 +596,7 @@ void FluxboxWindow::decorate() { | |||
596 | frame.ubutton_pixel = texture->color().pixel(); | 596 | frame.ubutton_pixel = texture->color().pixel(); |
597 | } else | 597 | } else |
598 | frame.ubutton = | 598 | frame.ubutton = |
599 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); | 599 | image_ctrl->renderImage(frame.button_w, frame.button_h, *texture); |
600 | if (tmp) image_ctrl->removeImage(tmp); | 600 | if (tmp) image_ctrl->removeImage(tmp); |
601 | 601 | ||
602 | tmp = frame.pbutton; | 602 | tmp = frame.pbutton; |
@@ -606,7 +606,7 @@ void FluxboxWindow::decorate() { | |||
606 | frame.pbutton_pixel = texture->color().pixel(); | 606 | frame.pbutton_pixel = texture->color().pixel(); |
607 | } else | 607 | } else |
608 | frame.pbutton = | 608 | frame.pbutton = |
609 | image_ctrl->renderImage(frame.button_w, frame.button_h, texture); | 609 | image_ctrl->renderImage(frame.button_w, frame.button_h, *texture); |
610 | if (tmp) image_ctrl->removeImage(tmp); | 610 | if (tmp) image_ctrl->removeImage(tmp); |
611 | 611 | ||
612 | if (decorations.titlebar) { | 612 | if (decorations.titlebar) { |
@@ -617,7 +617,7 @@ void FluxboxWindow::decorate() { | |||
617 | frame.ftitle_pixel = texture->color().pixel(); | 617 | frame.ftitle_pixel = texture->color().pixel(); |
618 | } else | 618 | } else |
619 | frame.ftitle = | 619 | frame.ftitle = |
620 | image_ctrl->renderImage(frame.width, frame.title_h, texture); | 620 | image_ctrl->renderImage(frame.width, frame.title_h, *texture); |
621 | 621 | ||
622 | if (tmp) | 622 | if (tmp) |
623 | image_ctrl->removeImage(tmp); | 623 | image_ctrl->removeImage(tmp); |
@@ -629,7 +629,7 @@ void FluxboxWindow::decorate() { | |||
629 | frame.utitle_pixel = texture->color().pixel(); | 629 | frame.utitle_pixel = texture->color().pixel(); |
630 | } else | 630 | } else |
631 | frame.utitle = | 631 | frame.utitle = |
632 | image_ctrl->renderImage(frame.width, frame.title_h, texture); | 632 | image_ctrl->renderImage(frame.width, frame.title_h, *texture); |
633 | if (tmp) image_ctrl->removeImage(tmp); | 633 | if (tmp) image_ctrl->removeImage(tmp); |
634 | 634 | ||
635 | XSetWindowBorder(display, frame.title, | 635 | XSetWindowBorder(display, frame.title, |
@@ -652,7 +652,7 @@ void FluxboxWindow::decorate() { | |||
652 | frame.fhandle_pixel = texture->color().pixel(); | 652 | frame.fhandle_pixel = texture->color().pixel(); |
653 | } else | 653 | } else |
654 | frame.fhandle = | 654 | frame.fhandle = |
655 | image_ctrl->renderImage(frame.width, frame.handle_h, texture); | 655 | image_ctrl->renderImage(frame.width, frame.handle_h, *texture); |
656 | if (tmp) image_ctrl->removeImage(tmp); | 656 | if (tmp) image_ctrl->removeImage(tmp); |
657 | 657 | ||
658 | tmp = frame.uhandle; | 658 | tmp = frame.uhandle; |
@@ -662,7 +662,7 @@ void FluxboxWindow::decorate() { | |||
662 | frame.uhandle_pixel = texture->color().pixel(); | 662 | frame.uhandle_pixel = texture->color().pixel(); |
663 | } else | 663 | } else |
664 | frame.uhandle = | 664 | frame.uhandle = |
665 | image_ctrl->renderImage(frame.width, frame.handle_h, texture); | 665 | image_ctrl->renderImage(frame.width, frame.handle_h, *texture); |
666 | if (tmp) | 666 | if (tmp) |
667 | image_ctrl->removeImage(tmp); | 667 | image_ctrl->removeImage(tmp); |
668 | 668 | ||
@@ -673,7 +673,7 @@ void FluxboxWindow::decorate() { | |||
673 | frame.fgrip_pixel = texture->color().pixel(); | 673 | frame.fgrip_pixel = texture->color().pixel(); |
674 | } else | 674 | } else |
675 | frame.fgrip = | 675 | frame.fgrip = |
676 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, texture); | 676 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, *texture); |
677 | if (tmp) | 677 | if (tmp) |
678 | image_ctrl->removeImage(tmp); | 678 | image_ctrl->removeImage(tmp); |
679 | 679 | ||
@@ -684,7 +684,7 @@ void FluxboxWindow::decorate() { | |||
684 | frame.ugrip_pixel = texture->color().pixel(); | 684 | frame.ugrip_pixel = texture->color().pixel(); |
685 | } else | 685 | } else |
686 | frame.ugrip = | 686 | frame.ugrip = |
687 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, texture); | 687 | image_ctrl->renderImage(frame.grip_w, frame.grip_h, *texture); |
688 | if (tmp) image_ctrl->removeImage(tmp); | 688 | if (tmp) image_ctrl->removeImage(tmp); |
689 | 689 | ||
690 | XSetWindowBorder(display, frame.handle, | 690 | XSetWindowBorder(display, frame.handle, |
@@ -707,7 +707,7 @@ void FluxboxWindow::decorateLabel() { | |||
707 | frame.flabel = None; | 707 | frame.flabel = None; |
708 | frame.flabel_pixel = texture->color().pixel(); | 708 | frame.flabel_pixel = texture->color().pixel(); |
709 | } else | 709 | } else |
710 | frame.flabel = image_ctrl->renderImage(frame.label_w, frame.label_h, texture); | 710 | frame.flabel = image_ctrl->renderImage(frame.label_w, frame.label_h, *texture); |
711 | 711 | ||
712 | if (tmp) image_ctrl->removeImage(tmp); | 712 | if (tmp) image_ctrl->removeImage(tmp); |
713 | 713 | ||
@@ -717,7 +717,7 @@ void FluxboxWindow::decorateLabel() { | |||
717 | frame.ulabel = None; | 717 | frame.ulabel = None; |
718 | frame.ulabel_pixel = texture->color().pixel(); | 718 | frame.ulabel_pixel = texture->color().pixel(); |
719 | } else | 719 | } else |
720 | frame.ulabel = image_ctrl->renderImage(frame.label_w, frame.label_h, texture); | 720 | frame.ulabel = image_ctrl->renderImage(frame.label_w, frame.label_h, *texture); |
721 | 721 | ||
722 | if (tmp) image_ctrl->removeImage(tmp); | 722 | if (tmp) image_ctrl->removeImage(tmp); |
723 | } | 723 | } |