Merge branch 'matthiasc/for-main' into 'main'

docs: Updates

See merge request GNOME/gtk!7596

NEWS

@@ -17,12 +17,13 @@ Overview of Changes in 4.15.5, xx-xx-xxxx
  - Fix Emoji rendering in Vulkan
  - Rework color handling to take color states into account
  - Implement more powerful occlusion culling
+ - Minimize our use of renderpasses
 
 * Macos:
  - Fix window transparency
 
 * Debugging:
- - The inspector shows details about color states now
+ - The inspector shows details about color states
 
 * Deprecations:
  - gdk_draw_context_begin/end_frame
@@ -31,6 +32,9 @@ Overview of Changes in 4.15.5, xx-xx-xxxx
 * Build:
  - Require gstreamer 1.24
 
+* Translation updates
+ Romanian
+
 
 Overview of Changes in 4.15.4, 30-07-2024
 =========================================

docs/reference/gtk/running.md

@@ -262,6 +262,12 @@ A number of options affect behavior instead of logging:
 `high-depth`
 : Use high bit depth rendering if possible
 
+`linear`
+: Enable linear rendering
+
+`hdr`
+: Force HDR rendering
+
 `no-vsync`
 : Repaint instantly (uses 100% CPU with animations)
 
@@ -280,9 +286,6 @@ are only available when GTK has been configured with `-Ddebug=true`.
 `renderer`
 : General renderer information
 
-`opengl`
-: OpenGL renderer information
-
 `vulkan`
 : Check Vulkan errors
 
@@ -315,6 +318,9 @@ A number of options affect behavior instead of logging:
 `cairo`
 : Overlay error pattern over cairo drawing (finds fallbacks)
 
+`occlusion`
+: Overlay highlight over areas optimized via occlusion culling
+
 The special value `all` can be used to turn on all debug options. The special
 value `help` can be used to obtain a list of all supported debug options.
 
@@ -461,12 +467,12 @@ using and the GDK backend supports them:
 This variable can be set to a list of values, which cause GSK to
 disable certain optimizations of the "ngl" and "vulkan" renderer.
 
-`uber`
-: Don't use the uber shader
-
 `clear`
 : Use shaders instead of vkCmdClearAttachment()/glClear()
 
+`merge`
+: USe one vkCmdDraw()/glDrawArrays() per operation
+
 `blit`
 : Use shaders instead of vkCmdBlit()/glBlitFramebuffer()
 
@@ -476,6 +482,13 @@ disable certain optimizations of the "ngl" and "vulkan" renderer.
 `mipmap`
 : Avoid creating mipmaps
 
+`to-image`
+: Don't fast-path creation of images for nodes
+
+`occlusion`
+: Disable occlusion culling via opacity tracking
+
+
 The special value `all` can be used to turn on all values. The special
 value `help` can be used to obtain a list of all supported values.
 

gtk/gtkcssstyle.c

@@ -742,7 +742,7 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
   if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH)
     {
       attrs = add_pango_attr (attrs, pango_attr_strikethrough_new (TRUE));
-      if (!has_decoration_color)
+      if (has_decoration_color)
         attrs = add_pango_attr (attrs, pango_attr_strikethrough_color_new (decoration_color->red * 65535. + 0.5,
                                                                            decoration_color->green * 65535. + 0.5,
                                                                            decoration_color->blue * 65535. + 0.5));