diff options
| author | Sebastian Leske <sebastian.leske@sleske.name> | 2016-05-20 08:11:23 +0200 |
|---|---|---|
| committer | Sebastian Leske <sebastian.leske@sleske.name> | 2016-05-31 22:35:48 +0200 |
| commit | bd2e244ea877f242efbd02412f22aaa6a50fd2ab (patch) | |
| tree | 2c807a9c1ba9f357e2df19365b25ad101ef0a152 | |
| parent | 35edcae1a05dd49f0ec6ec1c4ceeacc290758720 (diff) | |
| download | navit-bd2e244ea877f242efbd02412f22aaa6a50fd2ab.tar.gz | |
Refactor:gui_internal:Remove out-ifdefed code and unused widget states.
| -rw-r--r-- | navit/gui/internal/gui_internal.h | 4 | ||||
| -rw-r--r-- | navit/gui/internal/gui_internal_search.c | 4 | ||||
| -rw-r--r-- | navit/gui/internal/gui_internal_widget.c | 24 |
3 files changed, 15 insertions, 17 deletions
diff --git a/navit/gui/internal/gui_internal.h b/navit/gui/internal/gui_internal.h index cbe1e20df..162fb296e 100644 --- a/navit/gui/internal/gui_internal.h +++ b/navit/gui/internal/gui_internal.h @@ -1,9 +1,7 @@ -struct widget; // defined in gui_internal.c +struct widget; struct graphics_image; struct gui_priv; -#define STATE_VISIBLE 1 -#define STATE_SELECTED 2 #define STATE_HIGHLIGHTED 4 #define STATE_SENSITIVE 8 #define STATE_EDIT 16 diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c index 262559c14..09b7bc38a 100644 --- a/navit/gui/internal/gui_internal_search.c +++ b/navit/gui/internal/gui_internal_search.c @@ -228,9 +228,9 @@ gui_internal_highlight_possible_keys(struct gui_priv *this, char *possible_keys) if (child_->data && strcmp("\b", child_->data)) { // FIXME don't disable special keys if ( (strlen(possible_keys) == 0) || (g_strrstr(possible_keys, child_->data)!=NULL ) ) { - child_->state|= STATE_HIGHLIGHTED|STATE_VISIBLE|STATE_SENSITIVE|STATE_CLEAR ; + child_->state|= STATE_HIGHLIGHTED|STATE_SENSITIVE|STATE_CLEAR ; } else { - child_->state&= ~(STATE_HIGHLIGHTED|STATE_VISIBLE|STATE_SELECTED) ; + child_->state&= ~STATE_HIGHLIGHTED; } gui_internal_widget_render(this,child_); } diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c index 438d1f01c..a4c859375 100644 --- a/navit/gui/internal/gui_internal_widget.c +++ b/navit/gui/internal/gui_internal_widget.c @@ -321,18 +321,18 @@ static void gui_internal_box_render(struct gui_priv *this, struct widget *w) gui_internal_background_render(this, w); if (w->foreground && w->border) { - struct point pnt[5]; - pnt[0]=w->p; - pnt[1].x=pnt[0].x+w->w; - pnt[1].y=pnt[0].y; - pnt[2].x=pnt[0].x+w->w; - pnt[2].y=pnt[0].y+w->h; - pnt[3].x=pnt[0].x; - pnt[3].y=pnt[0].y+w->h; - pnt[4]=pnt[0]; - graphics_gc_set_linewidth(w->foreground, w->border ? w->border : 1); - graphics_draw_lines(this->gra, w->foreground, pnt, 5); - graphics_gc_set_linewidth(w->foreground, 1); + struct point pnt[5]; + pnt[0]=w->p; + pnt[1].x=pnt[0].x+w->w; + pnt[1].y=pnt[0].y; + pnt[2].x=pnt[0].x+w->w; + pnt[2].y=pnt[0].y+w->h; + pnt[3].x=pnt[0].x; + pnt[3].y=pnt[0].y+w->h; + pnt[4]=pnt[0]; + graphics_gc_set_linewidth(w->foreground, w->border ? w->border : 1); + graphics_draw_lines(this->gra, w->foreground, pnt, 5); + graphics_gc_set_linewidth(w->foreground, 1); } l=w->children; |