ui: fixed ui issues
* fixed dock title buttons on bottom on Windows * fixed no gap between buttons on Linux * fixed dark scheme title bar contrast * fixed filter checkbox colors for dark schemes
This commit is contained in:
@@ -10,8 +10,8 @@
|
||||
</scrollbar>
|
||||
<dock>
|
||||
<text>#F7F7F7</text>
|
||||
<background>#777777</background>
|
||||
<line>#A0A0A0</line>
|
||||
<background>#555555</background>
|
||||
<line>#808080</line>
|
||||
<icon_type>white</icon_type> <!-- white, grey, black -->
|
||||
</dock>
|
||||
</window>
|
||||
@@ -460,7 +460,7 @@
|
||||
</table>
|
||||
|
||||
<screen_search>
|
||||
<background>#777777</background>
|
||||
<background>#555555</background>
|
||||
<box>
|
||||
<background>#272728</background>
|
||||
<text>#F7F7F7</text>
|
||||
|
||||
@@ -25,7 +25,15 @@ QDockWidget::title {
|
||||
|
||||
QDockWidget::close-button, QDockWidget::float-button {
|
||||
background: transparent;
|
||||
border: none;
|
||||
border: <platform_wml:0|0|1>px solid transparent;
|
||||
icon-size: 12px;
|
||||
margin-top: 2px;
|
||||
margin-top: <platform_wml:0|2|2>px;
|
||||
}
|
||||
|
||||
QDockWidget::close-button {
|
||||
margin-left: <platform_wml:0|2|0>px;
|
||||
}
|
||||
|
||||
QDockWidget::float-button {
|
||||
margin-right: <platform_wml:0|2|0>px;
|
||||
}
|
||||
|
||||
@@ -86,6 +86,10 @@ QTableView QTableCornerButton::section {
|
||||
border-top-left-radius: 10px;
|
||||
}
|
||||
|
||||
QCheckBox {
|
||||
color: <color:table/text/normal>;
|
||||
}
|
||||
|
||||
#help_button {
|
||||
background: transparent;
|
||||
border: none;
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "utility/logging/logging.h"
|
||||
#include "utility/ResourcePaths.h"
|
||||
#include "utility/text/TextAccess.h"
|
||||
#include "utility/utilityApp.h"
|
||||
#include "utility/utilityString.h"
|
||||
|
||||
#include "settings/ApplicationSettings.h"
|
||||
@@ -168,6 +169,23 @@ namespace utility
|
||||
{
|
||||
val = ColorScheme::getInstance()->getColor(val);
|
||||
}
|
||||
else if (key == "platform_wml")
|
||||
{
|
||||
std::vector<std::string> values = utility::splitToVector(val, '|');
|
||||
if (values.size() != 3)
|
||||
{
|
||||
LOG_ERROR("Syntax error in file: " + path.str());
|
||||
return "";
|
||||
}
|
||||
|
||||
switch (utility::getOsType())
|
||||
{
|
||||
case OS_WINDOWS: val = values[0]; break;
|
||||
case OS_MAC: val = values[1]; break;
|
||||
case OS_LINUX: val = values[2]; break;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_ERROR("Syntax error in file: " + path.str());
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
class FilePath;
|
||||
class QColor;
|
||||
class QIcon;
|
||||
class QPixmap;
|
||||
class QString;
|
||||
class QWidget;
|
||||
class FilePath;
|
||||
|
||||
namespace utility
|
||||
{
|
||||
@@ -25,4 +25,4 @@ namespace utility
|
||||
void copyNewFilesFromDirectory(QString src, QString dst);
|
||||
}
|
||||
|
||||
# endif // UTILITY_QT_H
|
||||
#endif // UTILITY_QT_H
|
||||
|
||||
Reference in New Issue
Block a user