From fe5ceb9ecfd9bbb83b96ba4f462b3f41688377bd Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 14 Jun 2018 19:58:21 +0200 Subject: [PATCH] icons: Fix icons not showing for format color buttons Adding a menu to a button seems to clear an icon set previously until the button is clicked. Fix this by reordering things. --- src/qtui/inputwidget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index f74903fc..756d0641 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -64,8 +64,6 @@ InputWidget::InputWidget(QWidget *parent) ui.boldButton->setIcon(QIcon::fromTheme("format-text-bold")); ui.italicButton->setIcon(QIcon::fromTheme("format-text-italic")); ui.underlineButton->setIcon(QIcon::fromTheme("format-text-underline")); - ui.textcolorButton->setIcon(QIcon::fromTheme("format-text-color")); - ui.highlightcolorButton->setIcon(QIcon::fromTheme("format-fill-color")); ui.clearButton->setIcon(QIcon::fromTheme("edit-clear")); ui.encryptionIconLabel->hide(); @@ -97,6 +95,10 @@ InputWidget::InputWidget(QWidget *parent) ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().last()); connect(_colorFillMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorHighlightChosen(QAction *))); + // Needs to be done after adding the menu, otherwise the icon mysteriously vanishes until clicked + ui.textcolorButton->setIcon(QIcon::fromTheme("format-text-color")); + ui.highlightcolorButton->setIcon(QIcon::fromTheme("format-fill-color")); + // Show/hide style button connect(ui.showStyleButton, SIGNAL(toggled(bool)), this, SLOT(setStyleOptionsExpanded(bool))); -- 2.20.1