diff options
| author | Dave Davenport <qball@gmpclient.org> | 2017-07-03 09:28:44 +0200 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2017-07-03 09:28:44 +0200 |
| commit | 1d881a37d466137ced9fae8ac78ff70871945b30 (patch) | |
| tree | a531c50f7a810ba3429df9e75194dae74d63719d /source | |
| parent | 3590b9504662d34b2d23fb3e402bbc192baf64b8 (diff) | |
| parent | 7e1c02b04c364ed1e3638432eebabf2d6e50acec (diff) | |
Merge remote-tracking branch 'origin/master' into next
Diffstat (limited to 'source')
| -rw-r--r-- | source/helper.c | 2 | ||||
| -rw-r--r-- | source/rofi.c | 5 | ||||
| -rw-r--r-- | source/theme.c | 5 | ||||
| -rw-r--r-- | source/xrmoptions.c | 6 |
4 files changed, 16 insertions, 2 deletions
diff --git a/source/helper.c b/source/helper.c index ec4c2397..6ef7498d 100644 --- a/source/helper.c +++ b/source/helper.c @@ -1103,7 +1103,7 @@ cairo_surface_t* cairo_image_surface_create_from_svg ( const gchar* file, int he g_object_unref ( handle ); /** Rendering fails */ - if ( G_UNLIKELY ( failed ) ){ + if ( G_UNLIKELY ( failed ) ) { g_warning ( "Failed to render file: '%s'", file ); cairo_surface_destroy ( surface ); surface = NULL; diff --git a/source/rofi.c b/source/rofi.c index 8179e1fe..e19d7b86 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -796,15 +796,18 @@ int main ( int argc, char *argv[] ) return EXIT_FAILURE; } + TICK_N ( "Setup Locale" ); rofi_collect_modi (); - rofi_collect_modi_setup (); TICK_N ( "Collect MODI" ); + rofi_collect_modi_setup (); + TICK_N ( "Setup MODI" ); main_loop = g_main_loop_new ( NULL, FALSE ); TICK_N ( "Setup mainloop" ); bindings = nk_bindings_new (); + TICK_N ( "NK Bindings" ); if ( !display_setup ( main_loop, bindings ) ) { g_warning ( "Connection has error" ); diff --git a/source/theme.c b/source/theme.c index b929a9ea..6e6e4cb3 100644 --- a/source/theme.c +++ b/source/theme.c @@ -691,6 +691,11 @@ static char * rofi_theme_convert_color ( char *col ) } void rofi_theme_convert_old ( void ) { + { + char *str = g_strdup_printf ( "#window { border: %d; padding: %d;}", config.menu_bw, config.padding ); + rofi_theme_parse_string ( str ); + g_free ( str ); + } if ( config.color_window ) { char **retv = g_strsplit ( config.color_window, ",", -1 ); const char * const conf[] = { diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 0b3d138f..87556a37 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -94,10 +94,16 @@ static XrmOption xrmOptions[] = { { xrm_String, "font", { .str = &config.menu_font }, NULL, "Font to use", CONFIG_DEFAULT }, + { xrm_Number, "borderwidth", { .num = &config.menu_bw }, NULL, + "", CONFIG_DEFAULT }, + { xrm_Number, "bw", { .num = &config.menu_bw }, NULL, + "Border width", CONFIG_DEFAULT }, { xrm_Number, "location", { .num = &config.location }, NULL, "Location on screen", CONFIG_DEFAULT }, + { xrm_Number, "padding", { .num = &config.padding }, NULL, + "Padding", CONFIG_DEFAULT }, { xrm_SNumber, "yoffset", { .snum = &config.y_offset }, NULL, "Y-offset relative to location", CONFIG_DEFAULT }, { xrm_SNumber, "xoffset", { .snum = &config.x_offset }, NULL, |