Opening the console on macOS, while in dark mode, the console prompt icon will not be colorized white like other icons. This applies the platformStyle to the icon so that It can be colorized white.
While here, refactor the promptIcon widget from a QPushButton to QLabel; which is more appropriate, per Qt Docs:
QLabel is used for displaying text or an image. No user interaction functionality is provided.
| Master | PR |
|---|---|
 |
 |
@hebasto This and #270 are independent.
Using a new prompt icon is independent from making sure it’s colorized white in dark mode.
Not a new icon, but text:
If you want to have a symbol to indicate user input vs. console output, why not keep it text-based, like in the example below? It uses the “>” character to indicate user input, to match the icon next to the input field.
607- <string/>
608- </property>
609- <property name="icon">
610- <iconset resource="../bitcoin.qrc">
611- <normaloff>:/icons/prompticon</normaloff>
612- <disabledoff>:/icons/prompticon</disabledoff>:/icons/prompticon</iconset>
updated from 2162b3e -> f5e5511 (pr330.01 -> pr330.02, diff)
Changes:
icon property for a QLabel. To address this, I instead also set the pixmap in the *.ui file. Here, I also set the scaled property so that the pixmap will actually show in a designer tool. Because of this, I change the dimension from 16 x 24 to 14 x 14. Here’s why:If I keep the original dimensions, the pixmap will look warped in the designer tool:
It is ok to set the dimensions of the QLabel to the exact dimensions we set for the pixmap itself. Doing so means the pixmap will look normal in the designer tool:
0ui->promptIcon->setPixmap(platformStyle->SingleColorIcon(":/icons/prompticon").pixmap(14, 14));
There is no change in the size of this pixmap(previously icon) comparing master, pr330.01, or pr330.02:
| Master | PR330.01 | PR330.02 (this) |
|---|---|---|
 |
 |
 |
updated from f5e5511 -> be85c7f (pr330.02 -> pr330.03, diff)
Changes:
promptIcon. To fix this, I now set promptIcon below clearButton instead of below fontSmallerButton
Opening the console on macOS, while in dark mode, the console prompt icon will not be colorized white like other icons. This applies the
platformStyleto the icon so that It can be colorized white.While here, refactor the
promptIconwidget from aQPushButtontoQLabel; which is more appropriate, per Qt Docs:QLabel is used for displaying text or an image. No user interaction functionality is provided.
Master PR
Does this line (from #275) https://github.com/bitcoin-core/gui/blob/123b401e0acf3b26f149711bdf06d7f6eced1968/src/qt/rpcconsole.cpp#L853 change anything?
@hebasto
It seems that we’ve uncovered the first “bug” since the merge of 275. If you start off with dark mode on the current master, which includes 275, the promptIcon is colored black. It will become colorized if you switch to light mode then back to dark mode. Below are screenshots showing this behavior
| Start with Dark Mode on Master | Switch to Light then Back to Dark |
|---|---|
Another thing to notice is that because this is currently a disabled QPushButton, the promptIcon is colored gray instead of white.
Applying this PR on top of master (which requires changes to do), fixes this “bug”, makes the promptIcon class appropriate, and lets it be colorized white.
There’s currently a silent merge conflict with #275 and will be pushing changes to fix this.
591@@ -592,34 +592,17 @@
592 <number>3</number>
593 </property>
594 <item>
595- <widget class="QPushButton" name="promptIcon">
596- <property name="enabled">
597- <bool>false</bool>
598- </property>
599+ <widget class="QLabel" name="promptIcon">
GUIUtil::ThemedLabel?
See, a rough implementation of this suggestion here: https://github.com/jarolrod/gui/commit/4bc138e647cd6d5c7b2671d070c8c15623d1c37f
I think the current approach is simpler
I think the current approach is simpler
What about a minimal change:
0--- a/src/qt/rpcconsole.cpp
1+++ b/src/qt/rpcconsole.cpp
2@@ -525,6 +525,8 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
3 //: Secondary shortcut to decrease the RPC console font size.
4 GUIUtil::AddButtonShortcut(ui->fontSmallerButton, tr("Ctrl+_"));
5
6+ ui->promptIcon->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/prompticon")));
7+
8 // Install event filter for up and down arrow
9 ui->lineEdit->installEventFilter(this);
10 ui->lineEdit->setMaxLength(16 * 1024 * 1024);
?
591@@ -592,34 +592,17 @@
592 <number>3</number>
593 </property>
594 <item>
595- <widget class="QPushButton" name="promptIcon">
596- <property name="enabled">
597- <bool>false</bool>
598- </property>
599+ <widget class="GUIUtil::ThemedLabel" name="promptIcon">
1640@@ -1658,6 +1641,12 @@
1641 <slot>clear()</slot>
1642 </slots>
1643 </customwidget>
1644+ <customwidget>
1645+ <class>GUIUtil::ThemedLabel</class>
1646+ <extends>QLabel</extends>
1647+ <header>qt/guiutil.h</header>
1648+ <container>2</container>
Prefer to fix with b942216a1a72cfa049c951ac573e047794a5b8f1 or such.
It’d be nice to magically make theming work everywhere, but this approach doesn’t seem worth it.
Updated from 8095c81 -> 2f23ad2 (pr330.05 -> pr330.06)
Changes:
Tested on macOS 11.3, macOS 10.15.7, and macOS 10.14.6. Below are screenshots showing the prompt icon properly re-colorized on the mentioned platforms:
| Start: Dark Mode | Switch: Light Mode |
|---|---|
| Start: Light Mode | Switch: Dark Mode |
|---|---|
| Start: Dark Mode | Switch: Light Mode |
|---|---|
| Start: Light Mode | Switch: Dark Mode |
|---|---|
| Start: Dark Mode | Switch: Light Mode |
|---|---|
 |
 |
| Start: Light Mode | Switch: Dark Mode |
|---|---|
 |
 |