Skip to content

Commit b980d5b

Browse files
metsmamrts
authored andcommitted
Split menu to two rows and workaround character truncation
WE2-822, WE2-821 Signed-off-by: Raul Metsma <raul@metsma.ee>
1 parent 14bdab1 commit b980d5b

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/ui/dialog.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ color: #003168;
9393
border: 0px;
9494
max-height: 22px;
9595
padding-left: 7px;
96-
padding-right: 7px;
96+
padding-right: 6px;
9797
font-size: 14px;
9898
text-align: left;
9999
}

src/ui/webeiddialog.cpp

+9-5
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,10 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private)
102102
{QStringLiteral("cs"), QStringLiteral("Čeština")},
103103
{QStringLiteral("sk"), QStringLiteral("Slovenština")}};
104104
ui->langButton->setText(tr("EN", "Active language"));
105-
if (auto i = std::find_if(
106-
LANG_LIST.cbegin(), LANG_LIST.cend(),
107-
[&](const auto& elem) { return elem.first == ui->langButton->text().toLower(); });
105+
if (auto i = std::find_if(LANG_LIST.cbegin(), LANG_LIST.cend(),
106+
[lang = ui->langButton->text().toLower()](const auto& elem) {
107+
return elem.first == lang;
108+
});
108109
i != LANG_LIST.cend()) {
109110
ui->langButton->setAccessibleName(i->second);
110111
}
@@ -115,20 +116,23 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private)
115116
}
116117
auto* menu = new QWidget(this);
117118
menu->setObjectName("langMenu");
118-
auto* layout = new QVBoxLayout(menu);
119+
auto* layout = new QGridLayout(menu);
119120
layout->setContentsMargins(1, 1, 1, 1);
120121
layout->setSpacing(1);
121122
auto* langGroup = new QButtonGroup(menu);
122123
langGroup->setExclusive(true);
124+
int i {};
123125
for (const auto& [lang, title] : LANG_LIST) {
124126
auto* action = new QPushButton(menu);
125127
action->setText(title);
126128
action->setProperty("lang", lang);
127129
action->setAutoDefault(false);
128-
layout->addWidget(action);
130+
layout->addWidget(action, i / 2, i % 2);
129131
langGroup->addButton(action);
130132
action->setCheckable(true);
131133
action->setChecked(lang == ui->langButton->text().toLower());
134+
action->setMinimumSize(action->sizeHint() + QSize(1, 0));
135+
++i;
132136
}
133137
menu->show();
134138
menu->adjustSize();

0 commit comments

Comments
 (0)