From ce2cf6b2d991450439ede056d8f89bcf788ee410 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Sun, 8 Jan 2017 16:49:46 +0100
Subject: Make error dialog widget layout match normal one

---
 source/view.c             | 6 +++---
 source/widgets/listview.c | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'source')

diff --git a/source/view.c b/source/view.c
index e2f71513..f2d3233a 100644
--- a/source/view.c
+++ b/source/view.c
@@ -1423,7 +1423,7 @@ void rofi_view_itterrate ( RofiViewState *state, xcb_generic_event_t *ev, xkb_st
 static int rofi_view_calculate_height ( RofiViewState *state )
 {
     unsigned int height = 0;
-    if ( config.menu_lines == 0 || config.fullscreen == TRUE ) {
+    if ( listview_get_num_lines ( state->list_view ) == 0 || config.fullscreen == TRUE ) {
         height = CacheState.mon.h;
         return height;
     }
@@ -1587,9 +1587,9 @@ int rofi_view_error_dialog ( const char *msg, int markup )
     state->finalize   = process_result;
 
     state->main_window = container_create ( "window" );
-    state->main_box = box_create ( "window.mainbox", BOX_VERTICAL);
+    state->main_box = box_create ( "window.mainbox.message.box", BOX_VERTICAL);
     container_add ( state->main_window, WIDGET ( state->main_box ) );
-    state->text = textbox_create ( "window.mainbox.message", ( TB_AUTOHEIGHT | TB_WRAP ) + ( ( markup ) ? TB_MARKUP : 0 ),
+    state->text = textbox_create ( "window.mainbox.message.textbox", ( TB_AUTOHEIGHT | TB_WRAP ) + ( ( markup ) ? TB_MARKUP : 0 ),
             NORMAL, ( msg != NULL ) ? msg : "" );
     box_add ( state->main_box, WIDGET ( state->text ), TRUE, 1 );
 
diff --git a/source/widgets/listview.c b/source/widgets/listview.c
index c348ac1f..716855ce 100644
--- a/source/widgets/listview.c
+++ b/source/widgets/listview.c
@@ -591,6 +591,14 @@ void listview_set_num_lines ( listview *lv, unsigned int num_lines )
         lv->menu_lines = num_lines;
     }
 }
+
+unsigned int listview_get_num_lines ( listview *lv )
+{
+    if ( lv ) {
+        return lv->menu_lines;
+    }
+    return 0;
+}
 void listview_set_max_lines ( listview *lv, unsigned int max_lines )
 {
     if ( lv ) {
-- 
cgit v1.2.3