Merge branch 'main' into feature/esm-modules

This commit is contained in:
Simon Schneegans
2023-08-31 07:37:42 +02:00
12 changed files with 191 additions and 174 deletions
+2 -2
View File
@@ -69,7 +69,7 @@ void setOutputColor(vec4 outColor) {
// false, but it will prevent the compiler from optimizing away the uniforms uForOpening
// and uIsFullscreen. On KWin, we need to do this as we do not have a way to check if a
// uniform is used in the shader.
if (outColor.a > 10e42 && uForOpening && uIsFullscreen) {
if (outColor.a > 1000.0 && uForOpening && uIsFullscreen) {
outColor = vec4(0.0);
}
@@ -103,7 +103,7 @@ void setOutputColor(vec4 outColor) {
// false, but it will prevent the compiler from optimizing away the uniforms uForOpening
// and uIsFullscreen. On KWin, we need to do this as we do not have a way to check if a
// uniform is used in the shader.
if (outColor.a > 10e42 && uForOpening && uIsFullscreen) {
if (outColor.a > 1000.0 && uForOpening && uIsFullscreen) {
outColor = vec4(0.0);
}
+3 -3
View File
@@ -33,7 +33,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<object class="GtkButton" id="reset-snap-animation-time">
<property name="icon-name">edit-clear-symbolic</property>
<property name="valign">center</property>
<property name="tooltip-text">Reset to Default Value</property>
<property name="tooltip-text" translatable="yes">Reset to Default Value</property>
<style>
<class name="flat" />
</style>
@@ -66,7 +66,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<object class="GtkButton" id="reset-snap-scale">
<property name="icon-name">edit-clear-symbolic</property>
<property name="valign">center</property>
<property name="tooltip-text">Reset to Default Value</property>
<property name="tooltip-text" translatable="yes">Reset to Default Value</property>
<style>
<class name="flat" />
</style>
@@ -91,7 +91,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<object class="GtkButton" id="reset-snap-color">
<property name="icon-name">edit-clear-symbolic</property>
<property name="valign">center</property>
<property name="tooltip-text">Reset to Default Value</property>
<property name="tooltip-text" translatable="yes">Reset to Default Value</property>
<style>
<class name="flat" />
</style>