Backport GTK4 changes

Includes refactoring to use GMenuModel and GtkEventController
This commit is contained in:
Jason Francis
2020-05-08 08:45:41 -04:00
parent 71ce9741d1
commit f3f2b9e9e2
6 changed files with 402 additions and 549 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -4,8 +4,8 @@
cc = meson.get_compiler('c')
m_dep = cc.find_library('m', required : false)
rt_dep = cc.find_library('rt', required : false)
gdk = dependency('gdk-3.0')
gtk = dependency('gtk+-3.0')
gdk = dependency('gdk-3.0', version: '>= 3.24')
gtk = dependency('gtk+-3.0', version: '>= 3.24')
assert(gdk.get_pkgconfig_variable('targets').split().contains('wayland'), 'Wayland GDK backend not present')
epoxy = dependency('epoxy')

View File

@@ -205,10 +205,10 @@ struct wd_state {
unsigned int reset_idle;
struct wd_render_head_data *clicked;
/* top left, bottom right */
struct wd_point click_offset;
struct wd_point drag_start;
struct wd_point head_drag_start; /* 0-1 range in head rect */
bool panning;
struct wd_point pan_last;
struct wd_point pan_start;
GtkWidget *main_box;
GtkWidget *header_stack;