From 0419e01fe437cc0e45a794029f61d8e5907b15ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tin=20=C5=A0vagelj?= <tin.svagelj@live.com>
Date: Mon, 8 Apr 2024 12:20:50 +0000
Subject: [PATCH] Fix render order in draw_stuff (#1801)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pre draw hook is expected to run before anything else, so I moved imlib (e.g. ${image}) rendering after it.

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
---
 src/conky.cc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/conky.cc b/src/conky.cc
index 37b41de3..cf27e3fc 100644
--- a/src/conky.cc
+++ b/src/conky.cc
@@ -1592,15 +1592,16 @@ static void draw_text() {
 }
 
 void draw_stuff() {
-#ifdef BUILD_GUI
-  text_offset_x = text_offset_y = 0;
-#ifdef BUILD_IMLIB2
-  cimlib_render(text_start_x, text_start_y, window.width, window.height);
-#endif /* BUILD_IMLIB2 */
-#endif /* BUILD_GUI */
   for (auto output : display_outputs()) output->begin_draw_stuff();
+
 #ifdef BUILD_GUI
   llua_draw_pre_hook();
+
+#ifdef BUILD_IMLIB2
+  text_offset_x = text_offset_y = 0;
+  cimlib_render(text_start_x, text_start_y, window.width, window.height);
+#endif /* BUILD_IMLIB2 */
+
   for (auto output : display_outputs()) {
     if (!output->graphical()) continue;
     // XXX: we assume a single graphical display
@@ -1633,12 +1634,16 @@ void draw_stuff() {
     set_foreground_color(default_color.get(*state));
     unset_display_output();
   }
+
 #endif /* BUILD_GUI */
+  // always draw text
   draw_mode = FG;
   draw_text();
-#if defined(BUILD_GUI)
+#ifdef BUILD_GUI
+
   llua_draw_post_hook();
 #endif /* BUILD_GUI */
+
   for (auto output : display_outputs()) output->end_draw_stuff();
 }