PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Make hmode workable again.

This commit is contained in:
QC 2015-01-13 12:16:32 +01:00
parent e166fa3d8e
commit 46ab505be7
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source/rofi.c
View File

@ -1409,43 +1409,15 @@ MenuReturn menu ( char **lines, unsigned int num_lines, char **input, char *prom
// Get active monitor size.
monitor_active ( &mon );
menu_calculate_window_and_element_width ( &state, &mon );
// search text input
// we need this at this point so we can get height.
// we need this at this point so we can get height.
state.case_indicator = textbox_create ( main_window, TB_AUTOHEIGHT | TB_AUTOWIDTH,
( config.padding ), ( config.padding ),
0, 0,
NORMAL, "*" );
state.prompt_tb = textbox_create ( main_window, TB_AUTOHEIGHT | TB_AUTOWIDTH,
( config.padding ),
( config.padding ),
0, 0, NORMAL, prompt );
state.text = textbox_create ( main_window, TB_AUTOHEIGHT | TB_EDITABLE,
( config.padding ) + textbox_get_width ( state.prompt_tb ),
( config.padding ),
( ( config.hmode == TRUE ) ?
state.element_width : ( state.w - ( 2 * ( config.padding ) ) ) )
- textbox_get_width ( state.prompt_tb )
- textbox_get_width ( state.case_indicator ), 0,
NORMAL,
( input != NULL ) ? *input : "" );
// Move indicator to end.
textbox_move ( state.case_indicator,
state.w - ( 2 * ( config.padding ) ) - textbox_get_width ( state.case_indicator ),
0 );
textbox_show ( state.text );
textbox_show ( state.prompt_tb );
if ( config.case_sensitive ) {
textbox_show ( state.case_indicator );
}
// Height of a row.
int line_height = textbox_get_height ( state.text );
int line_height = textbox_get_height ( state.case_indicator );
if ( config.menu_lines == 0 ) {
// Autosize it.
int h = mon.h - config.padding * 2 - LINE_MARGIN - config.menu_bw * 2;
@ -1456,11 +1428,40 @@ MenuReturn menu ( char **lines, unsigned int num_lines, char **input, char *prom
state.menu_lines = config.menu_lines;
}
menu_calculate_rows_columns ( &state );
menu_calculate_window_and_element_width ( &state, &mon );
// Prompt box.
state.prompt_tb = textbox_create ( main_window, TB_AUTOHEIGHT | TB_AUTOWIDTH,
( config.padding ),
( config.padding ),
0, 0, NORMAL, prompt );
// Entry box
int entrybox_width = (
( config.hmode == TRUE ) ? state.element_width : ( state.w - ( 2 * ( config.padding ) ) ) )
- textbox_get_width ( state.prompt_tb )
- textbox_get_width ( state.case_indicator );
state.text = textbox_create ( main_window, TB_AUTOHEIGHT | TB_EDITABLE,
( config.padding ) + textbox_get_width ( state.prompt_tb ),
( config.padding ),
entrybox_width, 0,
NORMAL,
( input != NULL ) ? *input : "" );
// Move indicator to end.
textbox_move ( state.case_indicator,
config.padding + textbox_get_width ( state.prompt_tb ) + entrybox_width,
0 );
textbox_show ( state.text );
textbox_show ( state.prompt_tb );
if ( config.case_sensitive ) {
textbox_show ( state.case_indicator );
}
int element_height = line_height * config.element_height;
// filtered list display
state.boxes = g_malloc0_n ( state.max_elements, sizeof ( textbox* ) );