|
|
commit eaed37b6f81f5f2c03f43b19c3a3b2e141df199a
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Tue Jun 1 14:37:07 2021 +0200
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Wed Sep 29 12:14:55 2021 +0200
Wayland platform: set default color of cairo contexts to black
src/drivers/Wayland/Fl_Wayland_Graphics_Driver.cxx | 3 ++-
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git src/drivers/Wayland/Fl_Wayland_Graphics_Driver.cxx src/drivers/Wayland/Fl_Wayland_Graphics_Driver.cxx
index 7c8ea38..60fb0f4 100644
--- src/drivers/Wayland/Fl_Wayland_Graphics_Driver.cxx
+++ src/drivers/Wayland/Fl_Wayland_Graphics_Driver.cxx
@@ -55,8 +55,8 @@ static void buffer_gets_ready(void *user_data, struct wl_buffer *unused)
{
struct wld_window *window = (struct wld_window *)user_data;
window->buffer->wl_buffer_ready = true;
+//fprintf(stderr, "buffer_gets_ready: needs_commit=%d\n", window->buffer->draw_buffer_needs_commit);
if (window->buffer->draw_buffer_needs_commit) {
-//fprintf(stderr, "buffer_gets_ready calls buffer_commit\n");
Fl_Wayland_Graphics_Driver::buffer_commit(window);
}
}
@@ -127,6 +127,7 @@ void Fl_Wayland_Graphics_Driver::cairo_init(struct buffer *buffer, int width, in
}
cairo_set_source_rgba(buffer->cairo_, 1.0, 1.0, 1.0, 0.);
cairo_paint(buffer->cairo_);
+ cairo_set_source_rgba(buffer->cairo_, .0, .0, .0, 1.0); // Black default color
buffer->pango_layout_ = pango_cairo_create_layout(buffer->cairo_);
cairo_save(buffer->cairo_);
}
diff --git src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
index 99b8a90..8b8313f 100644
--- src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+++ src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
@@ -338,10 +338,12 @@ void Fl_Wayland_Window_Driver::make_current() {
// to support progressive drawing
if ( (!Fl_Wayland_Window_Driver::in_flush) && window && window->buffer && window->buffer->draw_buffer_needs_commit) {
while (! window->buffer->wl_buffer_ready) {
+//fprintf(stderr, "direct make_current calls wl_display_dispatch\n");
wl_display_dispatch(fl_display);
}
if (window->buffer->draw_buffer_needs_commit) {
wl_surface_damage_buffer(window->wl_surface, 0, 0, pWindow->w() * window->scale, pWindow->h() * window->scale);
+//fprintf(stderr, "direct make_current calls buffer_commit\n");
Fl_Wayland_Graphics_Driver::buffer_commit(window);
}
}
[ Direct Link to Message ] | |
|
| |