Merge remote-tracking branch 'origin/master' into themer

This commit is contained in:
Dave Davenport 2016-12-27 10:49:27 +01:00
commit c5439118a7
2 changed files with 5 additions and 0 deletions

View file

@ -354,6 +354,9 @@ static int window_match ( const Mode *sw, GRegex **tokens, unsigned int index )
if ( !test && c->name != NULL && c->name[0] != '\0' ) {
test = token_match ( ftokens, c->name );
}
if ( !test && c->wmdesktopstr != NULL && c->wmdesktopstr[0] != '\0' ) {
test = token_match ( ftokens, c->wmdesktopstr );
}
if ( test == 0 ) {
match = 0;

View file

@ -1684,6 +1684,8 @@ void rofi_view_set_overlay ( RofiViewState *state, const char *text )
unsigned int x_offset = state->width - ( 2 * state->border ) - widget_get_width ( WIDGET ( state->case_indicator ) );
x_offset -= widget_get_width ( WIDGET ( state->overlay ) );
widget_move ( WIDGET ( state->overlay ), x_offset, state->border );
// We want to queue a repaint.
rofi_view_queue_redraw ( );
}
void rofi_view_clear_input ( RofiViewState *state )