Make sure to load layout resource before opening popup

Change-Id: I30d5b15c5a66acdf25f17c4486fed9d0ed63a323

diff --git a/scl/sclcontroller.cpp b/scl/sclcontroller.cpp
index f515b16..3e30e45 100644 (file)
--- a/scl/sclcontroller.cpp
+++ b/scl/sclcontroller.cpp
@@ -618,6 +618,9 @@ CSCLController::process_button_pressed_event(sclwindow window, sclint x, sclint
                                 popupRect.y = coordinate->y + coordinate->popup_relative_y + baseWndRect.y;
                                 //popupRect.width = utils->get_scale_x(layout->width);
                                 //popupRect.height= utils->get_scale_y(layout->height);
+                                if (!(sclres_manager->loaded(popupLayoutId))) {
+                                    sclres_manager->load(popupLayoutId);
+                                }
                                 popupRect.width = layout->width;
                                 popupRect.height = layout->height;
                                 windows->close_all_popups();
@@ -914,6 +917,9 @@ CSCLController::process_button_long_pressed_event(sclwindow window, sclbyte key_
                                 if (layout) {
                                     //popupRect.width = utils->get_scale_x(layout->width);
                                     //popupRect.height= utils->get_scale_y(layout->height);
+                                    if (!(sclres_manager->loaded(popupLayoutId))) {
+                                        sclres_manager->load(popupLayoutId);
+                                    }
                                     popupRect.width = layout->width;
                                     popupRect.height = layout->height;
 
@@ -1951,6 +1957,9 @@ CSCLController::process_button_release_event(sclwindow window, sclint x, sclint
 
                                     //popupRect.width = utils->get_scale_x(layout->width);
                                     //popupRect.height= utils->get_scale_y(layout->height);
+                                    if (!(sclres_manager->loaded(popupLayoutId))) {
+                                        sclres_manager->load(popupLayoutId);
+                                    }
                                     popupRect.width = layout->width;
                                     popupRect.height = layout->height;