kwin_fixblur: Fix config for SVG location
Both the kwin_fixblur and kwin_reflect effects would read from the same key value if a custom reflection texture or SVG mask was set. The kwin_fixblur effect will now use "SvgLocation" instead of "TextureLocation".
This commit is contained in:
parent
7cc4ccabbc
commit
c4eccab84a
4 changed files with 5 additions and 5 deletions
|
@ -86,7 +86,7 @@ void BlurEffect::reconfigure(ReconfigureFlags flags)
|
||||||
BlurConfig::self()->read();
|
BlurConfig::self()->read();
|
||||||
|
|
||||||
m_includedWindows = BlurConfig::includedWindows().split(';');
|
m_includedWindows = BlurConfig::includedWindows().split(';');
|
||||||
m_texturePath = BlurConfig::textureLocation();
|
m_texturePath = BlurConfig::svgLocation();
|
||||||
updateTexture();
|
updateTexture();
|
||||||
updateAllWindows();
|
updateAllWindows();
|
||||||
effects->addRepaintFull();
|
effects->addRepaintFull();
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<kcfgfile arg="true"/>
|
<kcfgfile arg="true"/>
|
||||||
<group name="Effect-Reflection">
|
<group name="Effect-Reflection">
|
||||||
|
|
||||||
<entry name="TextureLocation" type="String">
|
<entry name="SvgLocation" type="String">
|
||||||
<default></default>
|
<default></default>
|
||||||
</entry>
|
</entry>
|
||||||
<entry name="IncludedWindows" type="String">
|
<entry name="IncludedWindows" type="String">
|
||||||
|
|
|
@ -46,13 +46,13 @@ BlurEffectConfig::BlurEffectConfig(QWidget *parent, const QVariantList &args)
|
||||||
|
|
||||||
void BlurEffectConfig::clearTexturePath()
|
void BlurEffectConfig::clearTexturePath()
|
||||||
{
|
{
|
||||||
ui.kcfg_TextureLocation->setText("");
|
ui.kcfg_SvgLocation->setText("");
|
||||||
}
|
}
|
||||||
void BlurEffectConfig::setTexturePath()
|
void BlurEffectConfig::setTexturePath()
|
||||||
{
|
{
|
||||||
if(m_dialog->exec())
|
if(m_dialog->exec())
|
||||||
{
|
{
|
||||||
ui.kcfg_TextureLocation->setText(m_dialog->selectedFiles()[0]);
|
ui.kcfg_SvgLocation->setText(m_dialog->selectedFiles()[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="kcfg_TextureLocation">
|
<widget class="QLineEdit" name="kcfg_SvgLocation">
|
||||||
<property name="readOnly">
|
<property name="readOnly">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
|
Loading…
Add table
Reference in a new issue