diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-03-07 18:10:17 +0100 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2016-03-07 18:10:22 +0100 |
| commit | abe44475fc0d119d392d2fee7d407ef6e62bbf81 (patch) | |
| tree | ddbf136b4d452a093e0772f5e66449472871add3 | |
| parent | f21195dc1465d5a285a79b3b165c415d7ef9d97b (diff) | |
view: Fix multi-character compose sequences
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
| -rw-r--r-- | include/view.h | 2 | ||||
| -rw-r--r-- | source/view.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/view.h b/include/view.h index 85483ee8..abd0172c 100644 --- a/include/view.h +++ b/include/view.h @@ -23,7 +23,7 @@ typedef enum /** Create amanaged window. */ MENU_NORMAL_WINDOW = 2, /** ERROR dialog */ - MENU_ERROR_DIALOG = 4, + MENU_ERROR_DIALOG = 4, } MenuFlags; /** diff --git a/source/view.c b/source/view.c index 4a4d1eff..69a61975 100644 --- a/source/view.c +++ b/source/view.c @@ -307,7 +307,7 @@ unsigned int rofi_view_get_completed ( const RofiViewState *state ) static void rofi_view_resize ( RofiViewState *state ) { - if ( (state->menu_flags&MENU_ERROR_DIALOG) == MENU_ERROR_DIALOG ){ + if ( ( state->menu_flags & MENU_ERROR_DIALOG ) == MENU_ERROR_DIALOG ) { // Resize of error dialog. int entrybox_width = state->w - ( 2 * ( state->border ) ); textbox_moveresize ( state->text, state->text->widget.x, state->text->widget.y, entrybox_width, state->line_height ); @@ -328,7 +328,7 @@ static void rofi_view_resize ( RofiViewState *state ) } int entrybox_width = state->w - ( 2 * ( state->border ) ); int offset = 0; - int width = textbox_get_width ( state->case_indicator ); + int width = textbox_get_width ( state->case_indicator ); entrybox_width -= width + textbox_get_width ( state->prompt_tb ); offset = width; textbox_moveresize ( state->text, state->text->widget.x, state->text->widget.y, entrybox_width, state->line_height ); @@ -1317,7 +1317,7 @@ static void rofi_view_mainloop_iter ( RofiViewState *state, xcb_generic_event_t case XKB_COMPOSE_NOTHING: break; } - if ( key == XKB_KEY_NoSymbol ) { + if ( ( key == XKB_KEY_NoSymbol ) && ( len == 0 ) ) { break; } } |