yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kcmkwin/compositing: remove tearing prevention and scaling options

Browse source 
The option are confusing and noone should ever need to touch them.

BUG: 450279
This commit is contained in:
Xaver Hugl 2022-10-30 03:03:04 +01:00
parent 378006cc73
commit c308a262be
3 changed files with 1 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/kcmkwin/kwincompositing/compositing.ui
View file

@ -35,29 +35,6 @@ you can reset this protection but be aware that this might result in an immediat
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="KMessageWidget" name="scaleWarning">
<property name="visible">
<bool>false</bool>
</property>
<property name="text">
<string>Scale method &quot;Accurate&quot; is not supported by all hardware and can cause performance regressions and rendering artifacts.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="KMessageWidget" name="tearingWarning">
<property name="visible">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<widget class="KMessageWidget" name="windowThumbnailWarning"> <widget class="KMessageWidget" name="windowThumbnailWarning">
<property name="visible"> <property name="visible">
@ -168,70 +145,14 @@ you can reset this protection but be aware that this might result in an immediat
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<widget class="QLabel" name="scaleMethodLabel">
<property name="text">
<string>Scale method:</string>
</property>
</widget>
</item>
<item row="6" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="kcfg_glTextureFilter">
<item>
<property name="text">
<string>Smooth</string>
</property>
</item>
<item>
<property name="text">
<string>Accurate</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="13" column="0"> <item row="13" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Tearing prevention (&quot;vsync&quot;):</string>
</property>
</widget>
</item>
<item row="13" column="1">
<widget class="QComboBox" name="kcfg_glPreferBufferSwap">
<item>
<property name="text">
<string>Automatic</string>
</property>
</item>
<item>
<property name="text">
<string>Only when cheap</string>
</property>
</item>
<item>
<property name="text">
<string>Full screen repaints</string>
</property>
</item>
<item>
<property name="text">
<string>Re-use screen content</string>
</property>
</item>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_HiddenPreviews"> <widget class="QLabel" name="label_HiddenPreviews">
<property name="text"> <property name="text">
<string>Keep window thumbnails:</string> <string>Keep window thumbnails:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="13" column="1">
<widget class="QComboBox" name="kcfg_HiddenPreviews"> <widget class="QComboBox" name="kcfg_HiddenPreviews">
<item> <item>
<property name="text"> <property name="text">

18
src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg
View file

@ -22,14 +22,6 @@
</choices> </choices>
</entry> </entry>
<entry name="glTextureFilter" key="GLTextureFilter" type="Enum">
<default>Accurate</default>
<choices>
<choice name="Smooth" value="1"/>
<choice name="Accurate" value="2"/>
</choices>
</entry>
<entry name="Enabled" type="Bool"> <entry name="Enabled" type="Bool">
<default>true</default> <default>true</default>
</entry> </entry>
@ -38,16 +30,6 @@
<default>0</default> <default>0</default>
</entry> </entry>
<entry name="glPreferBufferSwap" key="GLPreferBufferSwap" type="Enum">
<default>AutoSwapStrategy</default>
<choices>
<choice name="AutoSwapStrategy" value="a" />
<choice name="ExtendDamage" value="e" />
<choice name="PaintFullScreen" value="p" />
<choice name="CopyFrontBuffer" value="c" />
</choices>
</entry>
<entry name="WindowsBlockCompositing" type="Bool"> <entry name="WindowsBlockCompositing" type="Bool">
<default>true</default> <default>true</default>
</entry> </entry>

30
src/kcmkwin/kwincompositing/main.cpp
View file

@ -80,8 +80,6 @@ KWinCompositingKCM::KWinCompositingKCM(QWidget *parent, const QVariantList &args
connect(reenableGlAction, &QAction::triggered, this, &KWinCompositingKCM::reenableGl); connect(reenableGlAction, &QAction::triggered, this, &KWinCompositingKCM::reenableGl);
connect(reenableGlAction, &QAction::triggered, m_form.glCrashedWarning, &KMessageWidget::animatedHide); connect(reenableGlAction, &QAction::triggered, m_form.glCrashedWarning, &KMessageWidget::animatedHide);
m_form.glCrashedWarning->addAction(reenableGlAction); m_form.glCrashedWarning->addAction(reenableGlAction);
m_form.scaleWarning->setIcon(QIcon::fromTheme(QStringLiteral("dialog-warning")));
m_form.tearingWarning->setIcon(QIcon::fromTheme(QStringLiteral("dialog-warning")));
m_form.windowThumbnailWarning->setIcon(QIcon::fromTheme(QStringLiteral("dialog-warning"))); m_form.windowThumbnailWarning->setIcon(QIcon::fromTheme(QStringLiteral("dialog-warning")));
m_form.kcfg_Enabled->setVisible(!compositingRequired()); m_form.kcfg_Enabled->setVisible(!compositingRequired());
@ -119,34 +117,6 @@ void KWinCompositingKCM::init()
m_form.animationSpeedControls->hide(); m_form.animationSpeedControls->hide();
} }
// gl scale filter
connect(m_form.kcfg_glTextureFilter, currentIndexChangedSignal, this, [this](int index) {
if (index == 2) {
m_form.scaleWarning->animatedShow();
} else {
m_form.scaleWarning->animatedHide();
}
});
// tearing prevention
connect(m_form.kcfg_glPreferBufferSwap, currentIndexChangedSignal, this, [this](int index) {
if (index == 1) {
// only when cheap - tearing
m_form.tearingWarning->setText(i18n("\"Only when cheap\" only prevents tearing for full screen changes like a video."));
m_form.tearingWarning->animatedShow();
} else if (index == 2) {
// full screen repaints
m_form.tearingWarning->setText(i18n("\"Full screen repaints\" can cause performance problems."));
m_form.tearingWarning->animatedShow();
} else if (index == 3) {
// re-use screen content
m_form.tearingWarning->setText(i18n("\"Re-use screen content\" causes severe performance problems on MESA drivers."));
m_form.tearingWarning->animatedShow();
} else {
m_form.tearingWarning->animatedHide();
}
});
// windowThumbnail // windowThumbnail
connect(m_form.kcfg_HiddenPreviews, currentIndexChangedSignal, this, [this](int index) { connect(m_form.kcfg_HiddenPreviews, currentIndexChangedSignal, this, [this](int index) {
if (index == 2) { if (index == 2) {