diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2014-03-25 19:00:21 +0100 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2014-03-25 19:00:21 +0100 |
| commit | 02c9ed65b227849f70a78f03b1b2e671b6abdfcd (patch) | |
| tree | 94769382bd4a209bb5387124b0e426ba609e5cfe | |
| parent | a877446d85347148a38792ac7e4cb8f75060364c (diff) | |
| download | ayatana-ido-02c9ed65b227849f70a78f03b1b2e671b6abdfcd.tar.gz ayatana-ido-02c9ed65b227849f70a78f03b1b2e671b6abdfcd.tar.bz2 ayatana-ido-02c9ed65b227849f70a78f03b1b2e671b6abdfcd.zip | |
Highlight back/forward buttons when hovering them with the pointer
Space bar still activates play/pause, unless the mouse pointer hovers another
button.
| -rw-r--r-- | src/idoplaybackmenuitem.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/idoplaybackmenuitem.c b/src/idoplaybackmenuitem.c index ceb70d9..b5b08fd 100644 --- a/src/idoplaybackmenuitem.c +++ b/src/idoplaybackmenuitem.c @@ -135,7 +135,10 @@ ido_playback_menu_item_parent_key_press_event (GtkWidget *widget, break; case GDK_KEY_space: - self->cur_pushed_button = BUTTON_PLAYPAUSE; + if (self->cur_hover_button != BUTTON_NONE) + self->cur_pushed_button = self->cur_hover_button; + else + self->cur_pushed_button = BUTTON_PLAYPAUSE; break; default: @@ -1425,7 +1428,8 @@ ido_playback_menu_item_draw (GtkWidget* button, cairo_t *cr) } // draw previous-button drop-shadow - if (item->cur_pushed_button == BUTTON_PREVIOUS && item->keyboard_activated ) + if ((item->cur_pushed_button == BUTTON_PREVIOUS && item->keyboard_activated) || + item->cur_hover_button == BUTTON_PREVIOUS) { _setup (&cr_surf, &surf, PREV_WIDTH+6, PREV_HEIGHT+6); _mask_prev (cr_surf, @@ -1485,7 +1489,8 @@ ido_playback_menu_item_draw (GtkWidget* button, cairo_t *cr) _finalize (cr, &cr_surf, &surf, PREV_X, PREV_Y); // draw next-button drop-shadow - if (item->cur_pushed_button == BUTTON_NEXT && item->keyboard_activated) + if ((item->cur_pushed_button == BUTTON_NEXT && item->keyboard_activated) || + item->cur_hover_button == BUTTON_NEXT) { _setup (&cr_surf, &surf, NEXT_WIDTH+6, NEXT_HEIGHT+6); _mask_next (cr_surf, @@ -1548,6 +1553,7 @@ ido_playback_menu_item_draw (GtkWidget* button, cairo_t *cr) if (item->current_state == STATE_PLAYING) { if (item->has_focus && + (item->cur_hover_button == BUTTON_NONE || item->cur_hover_button == BUTTON_PLAYPAUSE) && (item->cur_pushed_button == BUTTON_NONE || item->cur_pushed_button == BUTTON_PLAYPAUSE)) { _setup (&cr_surf, &surf, PAUSE_WIDTH+6, PAUSE_HEIGHT+6); @@ -1610,6 +1616,7 @@ ido_playback_menu_item_draw (GtkWidget* button, cairo_t *cr) else if (item->current_state == STATE_PAUSED) { if (item->has_focus && + (item->cur_hover_button == BUTTON_NONE || item->cur_hover_button == BUTTON_PLAYPAUSE) && (item->cur_pushed_button == BUTTON_NONE || item->cur_pushed_button == BUTTON_PLAYPAUSE)) { _setup (&cr_surf, &surf, PLAY_WIDTH+6, PLAY_HEIGHT+6); |