diff options
-rw-r--r-- | navit/gui/internal/gui_internal.h | 1 | ||||
-rw-r--r-- | navit/gui/internal/gui_internal_keyboard.c | 2 | ||||
-rw-r--r-- | navit/gui/internal/gui_internal_search.c | 3 | ||||
-rw-r--r-- | navit/gui/internal/gui_internal_widget.c | 22 |
4 files changed, 2 insertions, 26 deletions
diff --git a/navit/gui/internal/gui_internal.h b/navit/gui/internal/gui_internal.h index b13d34e34..cbe1e20df 100644 --- a/navit/gui/internal/gui_internal.h +++ b/navit/gui/internal/gui_internal.h @@ -10,7 +10,6 @@ struct gui_priv; #define STATE_CLEAR 32 #define STATE_EDITABLE 64 #define STATE_SCROLLABLE 128 -#define STATE_OFFSCREEN 256 #define GESTURE_RINGSIZE 100 diff --git a/navit/gui/internal/gui_internal_keyboard.c b/navit/gui/internal/gui_internal_keyboard.c index efddc010d..ea71eb593 100644 --- a/navit/gui/internal/gui_internal_keyboard.c +++ b/navit/gui/internal/gui_internal_keyboard.c @@ -54,8 +54,6 @@ static void gui_internal_cmd_keypress(struct gui_priv *this, struct widget *wm, void *data) { gui_internal_keypress_do(this, (char *) wm->data); - // Switch to lowercase after the first key is pressed - gui_internal_keyboard_to_lower_case(this); } static struct widget * diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c index 307d940bc..8e8daaa0b 100644 --- a/navit/gui/internal/gui_internal_search.c +++ b/navit/gui/internal/gui_internal_search.c @@ -401,7 +401,6 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data GList *l; struct widget *search_list=gui_internal_menu_data(this)->search_list; void *param=(void *)3; - int minlen=1; gui_internal_widget_table_clear(this, search_list); @@ -414,7 +413,7 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data dbg(lvl_debug,"%s now '%s'\n", wm->name, wm->text); gui_internal_search_idle_end(this); - if (wm->text && g_utf8_strlen(wm->text, -1) >= minlen) { + if (wm->text && g_utf8_strlen(wm->text, -1) > 0) { struct attr search_attr; dbg(lvl_debug,"process\n"); diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c index ab4c51201..524f325f2 100644 --- a/navit/gui/internal/gui_internal_widget.c +++ b/navit/gui/internal/gui_internal_widget.c @@ -320,11 +320,6 @@ static void gui_internal_box_render(struct gui_priv *this, struct widget *w) GList *l; gui_internal_background_render(this, w); -#if 0 - w->border=1; - w->foreground=this->foreground; -#endif -#if 1 if (w->foreground && w->border) { struct point pnt[5]; pnt[0]=w->p; @@ -339,13 +334,11 @@ static void gui_internal_box_render(struct gui_priv *this, struct widget *w) graphics_draw_lines(this->gra, w->foreground, pnt, 5); graphics_gc_set_linewidth(w->foreground, 1); } -#endif l=w->children; while (l) { wc=l->data; - if (!(wc->state & STATE_OFFSCREEN)) - gui_internal_widget_render(this, wc); + gui_internal_widget_render(this, wc); l=g_list_next(l); } if (w->scroll_buttons) @@ -561,14 +554,6 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w) wc->p.x=x-wc->w/2; if (w->flags & gravity_right) wc->p.x=x-wc->w; -#if 0 - if (w->flags & flags_scrolly) - dbg(lvl_debug,"%d - %d vs %d - %d\n",y,y+wc->h,w->p.y,w->p.y+w->h-hb); - if (y+wc->h > w->p.y+w->h-hb || y+wc->h < w->p.y) - wc->state |= STATE_OFFSCREEN; - else - wc->state &= ~STATE_OFFSCREEN; -#endif y+=wc->h+w->spy; l=g_list_next(l); } @@ -1369,11 +1354,6 @@ gui_internal_table_render(struct gui_priv * this, struct widget * w) } table_data->scroll_buttons.button_box->p.x = w->p.x; table_data->scroll_buttons.button_box->w = w->w; - // table_data->button_box->h = w->h - y; - // table_data->next_button->h=table_data->button_box->h; - // table_data->prev_button->h=table_data->button_box->h; - // table_data->next_button->c.y=table_data->button_box->c.y; - // table_data->prev_button->c.y=table_data->button_box->c.y; gui_internal_widget_pack(this,table_data->scroll_buttons.button_box); if(table_data->scroll_buttons.next_button->p.y > w->p.y + w->h + table_data->scroll_buttons.next_button->h) { |