Browse Source

Tweaks to high-dpi; Fix checkbox outline color

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 5 years ago
parent
commit
462b02d68c
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 37 additions and 21 deletions
  1. +13
    -13
      resources/ui/carla_refresh.ui
  2. +3
    -2
      source/frontend/carla_database.py
  3. +19
    -5
      source/theme/CarlaStyle.cpp
  4. +2
    -1
      source/theme/CarlaStylePrivate.hpp

+ 13
- 13
resources/ui/carla_refresh.ui View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>686</width>
<height>342</height>
<height>330</height>
</rect>
</property>
<property name="windowTitle">
@@ -242,8 +242,8 @@
<widget class="QLabel" name="ico_native">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
@@ -261,8 +261,8 @@
<widget class="QLabel" name="ico_posix32">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
@@ -301,8 +301,8 @@
<widget class="QLabel" name="ico_posix64">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
@@ -320,8 +320,8 @@
<widget class="QLabel" name="ico_rdflib">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
@@ -346,8 +346,8 @@
<widget class="QLabel" name="ico_win32">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
@@ -365,8 +365,8 @@
<widget class="QLabel" name="ico_win64">
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">


+ 3
- 2
source/frontend/carla_database.py View File

@@ -23,6 +23,7 @@ from copy import deepcopy
from subprocess import Popen, PIPE

from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QEventLoop, QThread, QSettings
from PyQt5.QtGui import QPixmap
from PyQt5.QtWidgets import QApplication, QDialog, QDialogButtonBox, QTableWidgetItem

# ---------------------------------------------------------------------------------------------------------------------
@@ -997,8 +998,8 @@ class PluginRefreshW(QDialog):
hasWin64 = os.path.exists(os.path.join(self.host.pathBinaries, "carla-discovery-win64.exe"))

self.fThread = SearchPluginsThread(self, host.pathBinaries)
self.fIconYes = getIcon("dialog-ok-apply").pixmap(16, 16)
self.fIconNo = getIcon("dialog-error").pixmap(16, 16)
self.fIconYes = QPixmap(":/16x16/dialog-ok-apply.svgz")
self.fIconNo = QPixmap(":/16x16/dialog-error.svgz")

# -------------------------------------------------------------------------------------------------------------
# Set-up GUI


+ 19
- 5
source/theme/CarlaStyle.cpp View File

@@ -1051,20 +1051,34 @@ void CarlaStyle::drawPrimitive(PrimitiveElement elem,
painter->translate(0.5, 0.5);
rect = rect.adjusted(0, 0, -1, -1);

QColor pressedColor = mergedColors(option->palette.base().color(), option->palette.foreground().color(), 85);
const QColor& baseColor = option->palette.base().color();

QColor pressedColor = mergedColors(baseColor, option->palette.foreground().color(), 85);
painter->setBrush(Qt::NoBrush);

// Gradient fill
QLinearGradient gradient(rect.topLeft(), rect.bottomLeft());
gradient.setColorAt(0, (state & State_Sunken) ? pressedColor : option->palette.base().color().darker(115));
gradient.setColorAt(0.15, (state & State_Sunken) ? pressedColor : option->palette.base().color());
gradient.setColorAt(1, (state & State_Sunken) ? pressedColor : option->palette.base().color());

if (state & State_Sunken)
{
gradient.setColorAt(0, pressedColor);
gradient.setColorAt(0.15, pressedColor);
gradient.setColorAt(1, pressedColor);
}
else
{
gradient.setColorAt(0, baseColor.blackF() > 0.4 ? baseColor.lighter(115) : baseColor.darker(115));
gradient.setColorAt(0.15, baseColor);
gradient.setColorAt(1, baseColor);
}

painter->setBrush((state & State_Sunken) ? QBrush(pressedColor) : gradient);
painter->setPen(QPen(outline.lighter(110), 1));

if (option->state & State_HasFocus && option->state & State_KeyboardFocusChange)
painter->setPen(QPen(highlightedOutline, 1));
else
painter->setPen(QPen(outline.lighter(110), 1));

painter->drawRect(rect);

QColor checkMarkColor = option->palette.text().color().darker(120);


+ 2
- 1
source/theme/CarlaStylePrivate.hpp View File

@@ -95,7 +95,8 @@ public:
{
if (! pal.window().texture().isNull())
return QColor(0, 0, 0, 160);
return pal.background().color().darker(140);
const QColor& col = pal.background().color();
return col.blackF() > 0.4 ? col.lighter(160) : col.darker(140);
}

QColor highlightedOutline(const QPalette &pal) const


Loading…
Cancel
Save