diff options
author | fluxgen <fluxgen> | 2003-12-10 23:33:15 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-10 23:33:15 (GMT) |
commit | 291f74fa3a127dd535b0515492c222c03a55349c (patch) | |
tree | d1a5bb6a8440d3daf3dac94ca678470824296a2c | |
parent | 94747da13c608b598dc9a50f54b80002bafe443a (diff) | |
download | fluxbox-291f74fa3a127dd535b0515492c222c03a55349c.zip fluxbox-291f74fa3a127dd535b0515492c222c03a55349c.tar.bz2 |
separator line, thanks ciaranm
-rw-r--r-- | src/FbTk/Menu.cc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 59cc310..cb0d7bb 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.44 2003/12/10 23:08:06 fluxgen Exp $ | 25 | // $Id: Menu.cc,v 1.45 2003/12/10 23:33:15 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -884,11 +884,19 @@ void Menu::drawItem(unsigned int index, bool highlight, bool clear, bool render_ | |||
884 | } | 884 | } |
885 | 885 | ||
886 | if (dotext && text) { | 886 | if (dotext && text) { |
887 | m_theme.frameFont().drawText(m_frame_pm.drawable(), // drawable | 887 | //!! TODO: this is just temporarly and will be removed |
888 | screenNumber(), | 888 | // once we've cleaned up the menu code this will be somewhere else... |
889 | tgc.gc(), | 889 | if (strcmp(text, "---") == 0){ // draw separator |
890 | text, len, // text string and lenght | 890 | m_frame_pm.drawRectangle(tgc.gc(), |
891 | text_x, text_y); // position | 891 | item_x + menu.bevel_w + menu.item_h + 1, item_y + (menu.item_h / 2), |
892 | menu.item_w - ((menu.bevel_w + menu.item_h) * 2) - 1, 0); | ||
893 | } else { // draw normal text | ||
894 | m_theme.frameFont().drawText(m_frame_pm.drawable(), // drawable | ||
895 | screenNumber(), | ||
896 | tgc.gc(), | ||
897 | text, len, // text string and lenght | ||
898 | text_x, text_y); // position | ||
899 | } | ||
892 | } | 900 | } |
893 | 901 | ||
894 | if (dosel && item->submenu()) { | 902 | if (dosel && item->submenu()) { |