diff options
author | fluxgen <fluxgen> | 2003-04-28 01:32:47 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-04-28 01:32:47 (GMT) |
commit | f839644e32067357f1dc43b8af53725f71aceb4a (patch) | |
tree | 83df568c0635aa9b165eb2a3b80a7ac28d2f4fd1 /src/FbTk | |
parent | 697aa333554f71a6670513fe896ab50ab5caf6bd (diff) | |
download | fluxbox-f839644e32067357f1dc43b8af53725f71aceb4a.zip fluxbox-f839644e32067357f1dc43b8af53725f71aceb4a.tar.bz2 |
fixed copyArea pos and size args
Diffstat (limited to 'src/FbTk')
-rw-r--r-- | src/FbTk/Menu.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index dcb4932..003e593 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.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: Menu.cc,v 1.17 2003/04/26 14:47:04 fluxgen Exp $ | 25 | // $Id: Menu.cc,v 1.18 2003/04/28 01:32:47 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -722,8 +722,8 @@ void Menu::drawItem(unsigned int index, bool highlight, bool clear, bool render_ | |||
722 | 722 | ||
723 | m_frame_pm.copyArea(menu.frame_pixmap, def_gc, | 723 | m_frame_pm.copyArea(menu.frame_pixmap, def_gc, |
724 | item_x, item_y, | 724 | item_x, item_y, |
725 | menu.item_w, menu.item_h, | 725 | item_x, item_y, |
726 | item_x, item_y); | 726 | menu.item_w, menu.item_h); |
727 | } | 727 | } |
728 | 728 | ||
729 | } else if (! (x == y && y == -1 && w == h && h == 0)) { | 729 | } else if (! (x == y && y == -1 && w == h && h == 0)) { |
@@ -757,7 +757,8 @@ void Menu::drawItem(unsigned int index, bool highlight, bool clear, bool render_ | |||
757 | if (menu.hilite_pixmap) { | 757 | if (menu.hilite_pixmap) { |
758 | m_frame_pm.copyArea(menu.hilite_pixmap, | 758 | m_frame_pm.copyArea(menu.hilite_pixmap, |
759 | m_theme.hiliteGC(), hoff_x, hoff_y, | 759 | m_theme.hiliteGC(), hoff_x, hoff_y, |
760 | hilite_w, hilite_h, hilite_x, hilite_y); | 760 | hilite_x, hilite_y, |
761 | hilite_w, hilite_h); | ||
761 | } else { | 762 | } else { |
762 | m_frame_pm.fillRectangle(m_theme.hiliteGC(), | 763 | m_frame_pm.fillRectangle(m_theme.hiliteGC(), |
763 | hilite_x, hilite_y, hilite_w, hilite_h); | 764 | hilite_x, hilite_y, hilite_w, hilite_h); |
@@ -770,9 +771,9 @@ void Menu::drawItem(unsigned int index, bool highlight, bool clear, bool render_ | |||
770 | if (menu.sel_pixmap) { | 771 | if (menu.sel_pixmap) { |
771 | m_frame_pm.copyArea(highlight ? menu.frame_pixmap : menu.sel_pixmap, | 772 | m_frame_pm.copyArea(highlight ? menu.frame_pixmap : menu.sel_pixmap, |
772 | m_theme.hiliteGC(), | 773 | m_theme.hiliteGC(), |
773 | 0, 0, | 774 | 0, 0, |
774 | half_w, half_w, | 775 | sel_x, sel_y, |
775 | sel_x, sel_y); | 776 | half_w, half_w); |
776 | } else { | 777 | } else { |
777 | m_frame_pm.fillRectangle(m_theme.hiliteGC(), | 778 | m_frame_pm.fillRectangle(m_theme.hiliteGC(), |
778 | sel_x, sel_y, half_w, half_w); | 779 | sel_x, sel_y, half_w, half_w); |