From d9def879309d3e38b73742d4decff085e447b8f2 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Mon, 6 Nov 2017 20:49:26 +0100 Subject: [PATCH] Allow height to be specified on window. Fixes: #718 --- source/view.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/source/view.c b/source/view.c index be5768bc..f1d6ea07 100644 --- a/source/view.c +++ b/source/view.c @@ -1457,15 +1457,19 @@ void rofi_view_frame_callback ( void ) static int rofi_view_calculate_height ( RofiViewState *state ) { - unsigned int height = 0; if ( CacheState.fullscreen == TRUE ) { - height = CacheState.mon.h; - return height; + return CacheState.mon.h; } + RofiDistance h = rofi_theme_get_distance ( WIDGET ( state->main_window ), "height", 0 ); + unsigned int height = distance_get_pixel ( h, ROFI_ORIENTATION_VERTICAL ); + // If height is set, return it. + if ( height > 0 ) { + return height; + } + // Autosize based on widgets. widget *main_window = WIDGET ( state->main_window ); - height = widget_get_desired_height ( main_window ); - return height; + return widget_get_desired_height ( main_window ); } static WidgetTriggerActionResult textbox_sidebar_modi_trigger_action ( widget *wid, MouseBindingMouseDefaultAction action, G_GNUC_UNUSED gint x, G_GNUC_UNUSED gint y, G_GNUC_UNUSED void *user_data )