Compare commits

..

No commits in common. "d6e56a9e2a78398607ed9afb70db07a8e78ca6d9" and "8c10f7a463e535a73ba2d8bd50412cc308ca8217" have entirely different histories.

2 changed files with 3 additions and 5 deletions

View File

@ -407,14 +407,12 @@ RibbonWindow {
validator: DoubleValidator { validator: DoubleValidator {
bottom: Math.min(spinbox.from, spinbox.to) bottom: Math.min(spinbox.from, spinbox.to)
top: Math.max(spinbox.from, spinbox.to) top: Math.max(spinbox.from, spinbox.to)
decimals: 2
notation: DoubleValidator.StandardNotation
} }
textFromValue: function(value, locale) { textFromValue: function(value, locale) {
return Number(value / 100).toLocaleString(locale, 'f', 2) return Number(value / 100).toLocaleString(locale, 'f', 2)
} }
valueFromText: function(text, locale) { valueFromText: function(text, locale) {
return Math.round(Number.fromLocaleString(locale, text) * 100) return Number.fromLocaleString(locale, text) * 100
} }
} }
} }

View File

@ -5,12 +5,12 @@
#include <QtQuick/QQuickWindow> #include <QtQuick/QQuickWindow>
#define STR(x) #x #define STR(x) #x
#define JOIN(a,b,c) STR(a.b.c) #define JOIN(a,b,c) STR(a.b.c)
#define VER_JOIN(x) JOIN(x) #define VER_JOIN(x) JOIN x
RibbonUI::RibbonUI(QQuickItem *parent) RibbonUI::RibbonUI(QQuickItem *parent)
: QQuickItem(parent) : QQuickItem(parent)
{ {
_version = VER_JOIN(RIBBONUI_VERSION); _version = VER_JOIN((RIBBONUI_VERSION));
_qt_version = QString(qVersion()).replace('.',"").toInt(); _qt_version = QString(qVersion()).replace('.',"").toInt();
_is_win11 = QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 22000); _is_win11 = QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 22000);
} }