diff options
| -rw-r--r-- | src/libs/utils/qtcwidgets.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/remotelinux/linuxdevice.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/remotelinux/linuxdevicetester.cpp | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/libs/utils/qtcwidgets.cpp b/src/libs/utils/qtcwidgets.cpp index 1d24ab7ec49..77d451d8c8f 100644 --- a/src/libs/utils/qtcwidgets.cpp +++ b/src/libs/utils/qtcwidgets.cpp @@ -208,7 +208,8 @@ void QtcButton::paintEvent(QPaintEvent *event) break; } case SmallList: { - if (isChecked() || hovered) { + const bool filled = hovered || isDown() || isChecked(); + if (filled) { const QBrush fill(creatorColor(isChecked() ? Theme::Token_Foreground_Muted : Theme::Token_Foreground_Subtle)); StyleHelper::drawCardBg(&p, bgR, fill, QPen(Qt::NoPen), brRectRounding); @@ -218,8 +219,9 @@ void QtcButton::paintEvent(QPaintEvent *event) case SmallLink: break; case Tag: { - const QBrush fill(hovered ? creatorColor(Theme::Token_Foreground_Subtle) - : QBrush(Qt::NoBrush)); + const bool filled = hovered || isDown() || isChecked(); + const QBrush fill(filled ? creatorColor(Theme::Token_Foreground_Subtle) + : QBrush(Qt::NoBrush)); const QPen outline(hovered ? QPen(Qt::NoPen) : creatorColor(Theme::Token_Stroke_Subtle)); StyleHelper::drawCardBg(&p, bgR, fill, outline, brRectRounding); break; diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index ec4b688f019..496e4426b6a 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -1510,7 +1510,10 @@ bool LinuxDevice::isDisconnected() const void LinuxDevice::tryToConnect(const Continuation<> &cont) const { - d->setupShell(sshParameters(), cont); + if (isDisconnected()) + d->setupShell(sshParameters(), cont); + else + cont(ResultOk); } void LinuxDevice::closeConnection() const diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index 74e6a1ed0dd..aa0d8318c4f 100644 --- a/src/plugins/remotelinux/linuxdevicetester.cpp +++ b/src/plugins/remotelinux/linuxdevicetester.cpp @@ -100,6 +100,7 @@ class ConnectionTaskAdapter final public: void operator()(ConnectionData *data, Tasking::TaskInterface *iface) { + data->device->closeConnection(); data->device->tryToConnect(Continuation<>(data->guard, [data, iface](const Result<> &res) { if (data->guard) { data->result = res; |