Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-29 01:58:26 +00:00
Code Issues Releases Activity

Fix render order in draw_stuff (#1801)

Browse Source 
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>
This commit is contained in:
Tin Švagelj 2024-04-08 12:20:50 +00:00 committed by GitHub
parent 407769d03d
commit 0419e01fe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/conky.cc
View File

@ -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();
}