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

Convert old location format into new, so we are compatible again. 

Fixes: #630
This commit is contained in:
Dave Davenport 2017-07-11 19:39:20 +02:00
parent 0d6bff9354
commit 5996303c08
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/helper.c
View File

@ -605,9 +605,9 @@ int config_sanity_check ( void )
config.menu_columns = 50; config.menu_columns = 50;
found_error = TRUE; found_error = TRUE;
} }
if ( !( config.location >= WL_CENTER && config.location <= WL_WEST ) ) { if ( !( config.location >= 0 && config.location <= 8) ) {
g_string_append_printf ( msg, "\t<b>config.location</b>=%d is invalid. Value should be between %d and %d.\n", g_string_append_printf ( msg, "\t<b>config.location</b>=%d is invalid. Value should be between %d and %d.\n",
config.location, WL_CENTER, WL_WEST ); config.location, 0, 8);
config.location = WL_CENTER; config.location = WL_CENTER;
found_error = 1; found_error = 1;
} }

22
source/view.c
View File

@ -258,9 +258,29 @@ static void rofi_view_update_prompt ( RofiViewState *state )
/** /**
* Calculates the window position * Calculates the window position
*/ */
/** Convert the old location to the new location type.
* 123
* 804
* 765
*
* nw n ne
* w c e
* sw s se
*/
static const int loc_transtable[9] = {
WL_CENTER,
WL_NORTH|WL_WEST,
WL_NORTH,
WL_NORTH|WL_EAST,
WL_EAST,
WL_SOUTH|WL_EAST,
WL_SOUTH,
WL_SOUTH|WL_WEST,
WL_WEST
};
static void rofi_view_calculate_window_position ( RofiViewState *state ) static void rofi_view_calculate_window_position ( RofiViewState *state )
{ {
int location = rofi_theme_get_position ( WIDGET ( state->main_window ), "location", config.location ); int location = rofi_theme_get_position ( WIDGET ( state->main_window ), "location", loc_transtable[config.location] );
int anchor = location; int anchor = location;
if ( !listview_get_fixed_num_lines ( state->list_view ) ) { if ( !listview_get_fixed_num_lines ( state->list_view ) ) {
anchor = location; anchor = location;