Remove logging, fix slider ticks
This commit is contained in:
parent
44ab969eb9
commit
acdcd91327
|
|
@ -778,18 +778,14 @@ QString BreezyDesktopEffectConfig::measurementUnitsFromUi() const
|
||||||
|
|
||||||
void BreezyDesktopEffectConfig::applyDistanceLabelFormatters()
|
void BreezyDesktopEffectConfig::applyDistanceLabelFormatters()
|
||||||
{
|
{
|
||||||
qCCritical(KWIN_XR) << "applyDistanceLabelFormatters()";
|
|
||||||
|
|
||||||
auto *focused = ui.kcfg_FocusedDisplayDistance;
|
auto *focused = ui.kcfg_FocusedDisplayDistance;
|
||||||
auto *all = ui.kcfg_AllDisplaysDistance;
|
auto *all = ui.kcfg_AllDisplaysDistance;
|
||||||
if (!focused || !all) {
|
if (!focused || !all) {
|
||||||
qCCritical(KWIN_XR) << "applyDistanceLabelFormatters: missing sliders" << focused << all;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only apply the unit conversion labels when the driver reports positional tracking.
|
// Only apply the unit conversion labels when the driver reports positional tracking.
|
||||||
if (!m_connectedDevicePoseHasPosition) {
|
if (!m_connectedDevicePoseHasPosition) {
|
||||||
qCCritical(KWIN_XR) << "applyDistanceLabelFormatters: pose has no position -> clearing formatter";
|
|
||||||
focused->clearValueToDisplayStringFn();
|
focused->clearValueToDisplayStringFn();
|
||||||
all->clearValueToDisplayStringFn();
|
all->clearValueToDisplayStringFn();
|
||||||
focused->setValueUnitsSuffix(QString());
|
focused->setValueUnitsSuffix(QString());
|
||||||
|
|
@ -801,33 +797,18 @@ void BreezyDesktopEffectConfig::applyDistanceLabelFormatters()
|
||||||
const QString units = measurementUnitsFromUi();
|
const QString units = measurementUnitsFromUi();
|
||||||
const QLocale loc;
|
const QLocale loc;
|
||||||
|
|
||||||
qCCritical(KWIN_XR) << "applyDistanceLabelFormatters: installing formatter"
|
|
||||||
<< "fullDistanceCm=" << fullCm
|
|
||||||
<< "units=" << units;
|
|
||||||
|
|
||||||
// Units should appear only in the floating value bubble, not on tick labels.
|
// Units should appear only in the floating value bubble, not on tick labels.
|
||||||
focused->setValueUnitsSuffix(units);
|
focused->setValueUnitsSuffix(units);
|
||||||
all->setValueUnitsSuffix(units);
|
all->setValueUnitsSuffix(units);
|
||||||
|
|
||||||
LabeledSlider::ValueToDisplayStringFn fn = [fullCm, units, loc](int raw) -> QString {
|
LabeledSlider::ValueToDisplayStringFn fn = [fullCm, units, loc](int raw) -> QString {
|
||||||
static int s_calls = 0;
|
|
||||||
if (s_calls < 25) {
|
|
||||||
qCCritical(KWIN_XR) << "distance label formatter called" << "raw=" << raw << "units=" << units << "fullCm=" << fullCm;
|
|
||||||
++s_calls;
|
|
||||||
}
|
|
||||||
if (fullCm <= 0.0) return QString();
|
if (fullCm <= 0.0) return QString();
|
||||||
const double ratio = static_cast<double>(raw) / 100.0; // slider uses a 2-decimal fixed-point scale
|
const double ratio = static_cast<double>(raw) / 100.0; // slider uses a 2-decimal fixed-point scale
|
||||||
const double cm = ratio * fullCm;
|
const double cm = ratio * fullCm;
|
||||||
if (units == QLatin1String("in")) {
|
if (units == QLatin1String("in")) {
|
||||||
const double inches = cm / 2.54;
|
const double inches = cm / 2.54;
|
||||||
if (s_calls <= 25) {
|
|
||||||
qCCritical(KWIN_XR) << "distance formatter computed" << ratio << "->" << inches << "in";
|
|
||||||
}
|
|
||||||
return loc.toString(inches, 'f', 1);
|
return loc.toString(inches, 'f', 1);
|
||||||
}
|
}
|
||||||
if (s_calls <= 25) {
|
|
||||||
qCCritical(KWIN_XR) << "distance formatter computed" << ratio << "->" << cm << "cm";
|
|
||||||
}
|
|
||||||
return loc.toString(cm, 'f', 0);
|
return loc.toString(cm, 'f', 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -108,10 +108,10 @@
|
||||||
<enum>QSlider::NoTicks</enum>
|
<enum>QSlider::NoTicks</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="tickStartOffset">
|
<property name="tickStartOffset">
|
||||||
<double>5</double>
|
<double>25</double>
|
||||||
</property>
|
</property>
|
||||||
<property name="tickInterval">
|
<property name="tickInterval">
|
||||||
<double>25</double>
|
<double>50</double>
|
||||||
</property>
|
</property>
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
|
|
@ -137,10 +137,10 @@
|
||||||
<enum>QSlider::NoTicks</enum>
|
<enum>QSlider::NoTicks</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="tickStartOffset">
|
<property name="tickStartOffset">
|
||||||
<double>5</double>
|
<double>25</double>
|
||||||
</property>
|
</property>
|
||||||
<property name="tickInterval">
|
<property name="tickInterval">
|
||||||
<double>25</double>
|
<double>50</double>
|
||||||
</property>
|
</property>
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
|
|
@ -642,8 +642,7 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="13" column="1">
|
<item row="13" column="1">
|
||||||
<widget class="QComboBox" name="comboMeasurementUnits">
|
<widget class="QComboBox" name="comboMeasurementUnits"/>
|
||||||
</widget>
|
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue