Fixes: NB#210597 - Basic list item does not elide subtitle text.

RevBy: Stanislav Ionascu
Merge-Request: 1166

Details: Enables text elide in MBasicListItem subtitleLabel.

MApplicationMenuView sets style name for all widgets (attached to MWidgetAction) if it wasn't set before.
-> MBasicListItem-widgets (in MWidgetAction) will have the same styling as "normal" menu items (MAction based) if the application has not specified style name by itself.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/corelib/widgets/mbasiclistitem.cpp b/src/corelib/widgets/mbasiclistitem.cpp
index 9c3c2bb4..dceea112 100644
--- a/src/corelib/widgets/mbasiclistitem.cpp
+++ b/src/corelib/widgets/mbasiclistitem.cpp
@@ -253,6 +253,7 @@ MLabel *MBasicListItem::subtitleLabelWidget()
 
     if (!d->subtitleLabel) {
         d->subtitleLabel = new MLabel(this);
+        d->subtitleLabel->setTextElide(true);
         d->subtitleLabel->setObjectName("CommonSubTitle");
     }
 
diff --git a/src/views/mapplicationmenuview.cpp b/src/views/mapplicationmenuview.cpp
index edf3fb17..3573aa04 100644
--- a/src/views/mapplicationmenuview.cpp
+++ b/src/views/mapplicationmenuview.cpp
@@ -245,8 +245,13 @@ MWidget *MApplicationMenuViewPrivate::createWidget(QAction *action)
             if (widget) {
                 MComboBox *comboBox = qobject_cast<MComboBox *>(widget);
                 if (comboBox) {
-                    comboBox->setStyleName("menucomboboxcommand");
+                    if (comboBox->styleName().isEmpty())
+                        comboBox->setStyleName("menucomboboxcommand");
                     connect(comboBox, SIGNAL(clicked()), widgetAction, SIGNAL(triggered()));
+                } else {
+                    MWidgetController *widgetCtrl = qobject_cast<MWidgetController *>(widget);
+                    if (widgetCtrl && widgetCtrl->styleName().isEmpty())
+                        widgetCtrl->setStyleName("menuwidgetcommand");
                 }
                 leasedWidgets.insert(action, widget);
             }