diff options
author | fluxgen <fluxgen> | 2002-05-29 21:15:07 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-05-29 21:15:07 (GMT) |
commit | 550fbdcf858e54eb4663d9ed896bd84ec52c1462 (patch) | |
tree | e1fa54a3b3d9733e4ae17f6c1ef6889bae650c86 | |
parent | 23f866f13a091bbb5efa34cdbb2e91318a4cf88e (diff) | |
download | fluxbox_lack-550fbdcf858e54eb4663d9ed896bd84ec52c1462.zip fluxbox_lack-550fbdcf858e54eb4663d9ed896bd84ec52c1462.tar.bz2 |
fixed invert highlight on toggle-items when they are selected
-rw-r--r-- | src/Basemenu.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc index 70e0b42..94c9da5 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.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: Basemenu.cc,v 1.24 2002/05/19 12:22:55 fluxgen Exp $ | 25 | // $Id: Basemenu.cc,v 1.25 2002/05/29 21:15:07 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -742,10 +742,12 @@ void Basemenu::drawItem(unsigned int index, bool highlight, bool clear, | |||
742 | m_screen->getMenuStyle()->hilite_gc, | 742 | m_screen->getMenuStyle()->hilite_gc, |
743 | hilite_x, hilite_y, hilite_w, hilite_h); | 743 | hilite_x, hilite_y, hilite_w, hilite_h); |
744 | } | 744 | } |
745 | } else if (dosel && item->isSelected() && | 745 | } |
746 | (menu.sel_pixmap != ParentRelative)) { | 746 | |
747 | if (dosel && item->isSelected() && | ||
748 | (menu.sel_pixmap != ParentRelative)) { | ||
747 | if (menu.sel_pixmap) { | 749 | if (menu.sel_pixmap) { |
748 | XCopyArea(m_display, menu.sel_pixmap, menu.frame, | 750 | XCopyArea(m_display, highlight ? menu.frame_pixmap : menu.sel_pixmap, menu.frame, |
749 | m_screen->getMenuStyle()->hilite_gc, 0, 0, | 751 | m_screen->getMenuStyle()->hilite_gc, 0, 0, |
750 | half_w, half_w, sel_x, sel_y); | 752 | half_w, half_w, sel_x, sel_y); |
751 | } else { | 753 | } else { |