PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

Fix crasher in error message. update reference output.

Browse source
This commit is contained in:
Dave Davenport 2017-01-01 19:33:16 +01:00
parent 47aa7c4900
commit df74540624
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/help-output.txt
View file

@ -134,6 +134,8 @@ Global options:
True (Default) True (Default)
-[no-]show-match Indicate how it match by underlining it. -[no-]show-match Indicate how it match by underlining it.
True (Default) True (Default)
-theme [string] New style theme file
(unset) (Default)
-pid [string] Pidfile location -pid [string] Pidfile location
/tmp/rofi.pid (File) /tmp/rofi.pid (File)
-kb-primary-paste [string] Paste primary selection -kb-primary-paste [string] Paste primary selection

2
doc/test_xr.txt
View file

@ -98,6 +98,8 @@ rofi.window-format: w c t
! rofi.click-to-exit: true ! rofi.click-to-exit: true
! "Indicate how it match by underlining it." Set from: Default ! "Indicate how it match by underlining it." Set from: Default
! rofi.show-match: true ! rofi.show-match: true
! "New style theme file" Set from: Default
! rofi.theme:
! "Pidfile location" Set from: File ! "Pidfile location" Set from: File
rofi.pid: /tmp/rofi.pid rofi.pid: /tmp/rofi.pid
! "Paste primary selection" Set from: File ! "Paste primary selection" Set from: File

8
source/view.c
View file

@ -657,7 +657,7 @@ void __create_window ( MenuFlags menu_flags )
* *
* Calculate the width of the window and the width of an element. * Calculate the width of the window and the width of an element.
*/ */
static void rofi_view_calculate_window_and_element_width ( RofiViewState *state ) static void rofi_view_calculate_window_width ( RofiViewState *state )
{ {
if ( config.fullscreen ) { if ( config.fullscreen ) {
state->width = CacheState.mon.w; state->width = CacheState.mon.w;
@ -1437,8 +1437,6 @@ RofiViewState *rofi_view_create ( Mode *sw,
state->main_box = box_create ( "mainbox.box", BOX_VERTICAL ); state->main_box = box_create ( "mainbox.box", BOX_VERTICAL );
window_add ( state->main_window, WIDGET ( state->main_box ) ); window_add ( state->main_window, WIDGET ( state->main_box ) );
// we need this at this point so we can get height.
rofi_view_calculate_window_and_element_width ( state );
state->input_bar = box_create ( "inputbar.box", BOX_HORIZONTAL ); state->input_bar = box_create ( "inputbar.box", BOX_HORIZONTAL );
state->input_bar_separator = separator_create ( "inputbar.separator", S_HORIZONTAL, 2 ); state->input_bar_separator = separator_create ( "inputbar.separator", S_HORIZONTAL, 2 );
@ -1516,6 +1514,8 @@ RofiViewState *rofi_view_create ( Mode *sw,
if ( (CacheState.flags&MENU_NORMAL_WINDOW) == MENU_NORMAL_WINDOW){ if ( (CacheState.flags&MENU_NORMAL_WINDOW) == MENU_NORMAL_WINDOW){
config.fixed_num_lines = TRUE; config.fixed_num_lines = TRUE;
} }
rofi_view_calculate_window_width ( state );
state->height = rofi_view_calculate_height ( state ); state->height = rofi_view_calculate_height ( state );
// Move the window to the correct x,y position. // Move the window to the correct x,y position.
@ -1545,7 +1545,6 @@ int rofi_view_error_dialog ( const char *msg, int markup )
state->menu_flags = MENU_ERROR_DIALOG; state->menu_flags = MENU_ERROR_DIALOG;
state->finalize = process_result; state->finalize = process_result;
rofi_view_calculate_window_and_element_width ( state );
state->main_window = window_create ( "window" ); state->main_window = window_create ( "window" );
state->main_box = box_create ( "mainbox.box", BOX_VERTICAL); state->main_box = box_create ( "mainbox.box", BOX_VERTICAL);
window_add ( state->main_window, WIDGET ( state->main_box ) ); window_add ( state->main_window, WIDGET ( state->main_box ) );
@ -1561,6 +1560,7 @@ int rofi_view_error_dialog ( const char *msg, int markup )
// resize window vertically to suit // resize window vertically to suit
state->height = line_height + window_get_border_width ( state->main_window)+widget_padding_get_padding_height ( WIDGET(state->main_window) ); state->height = line_height + window_get_border_width ( state->main_window)+widget_padding_get_padding_height ( WIDGET(state->main_window) );
rofi_view_calculate_window_width ( state );
// Calculte window position. // Calculte window position.
rofi_view_calculate_window_position ( state ); rofi_view_calculate_window_position ( state );