DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(engine/linux): format embedder sources

Browse Source
This commit is contained in:
Rich Young 2026-02-06 02:46:01 -05:00
parent 59e5706723
commit 2bef41145b
7 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/shell/platform/linux/fl_compositor.h
View File

@ -8,8 +8,8 @@
#include <cairo.h>
#include <gdk/gdk.h>
#include "flutter/shell/platform/linux/fl_gtk.h"
#include "flutter/shell/platform/embedder/embedder.h"
#include "flutter/shell/platform/linux/fl_gtk.h"
G_BEGIN_DECLS

3
engine/src/flutter/shell/platform/linux/fl_compositor_opengl.cc
View File

@ -420,8 +420,7 @@ static gboolean fl_compositor_opengl_render(FlCompositor* compositor,
cairo_scale(cr, 1.0, -1.0);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
#endif
gdk_cairo_draw_from_gl(cr, surface,
fl_framebuffer_get_texture_id(sibling),
gdk_cairo_draw_from_gl(cr, surface, fl_framebuffer_get_texture_id(sibling),
GL_TEXTURE, scale_factor, 0, 0, width, height);
#if FLUTTER_LINUX_GTK4
G_GNUC_END_IGNORE_DEPRECATIONS

3
engine/src/flutter/shell/platform/linux/fl_display_monitor.cc
View File

@ -42,8 +42,7 @@ static void notify_display_update(FlDisplayMonitor* self) {
FlutterEngineDisplay* display = &displays[i];
#if FLUTTER_LINUX_GTK4
GdkMonitor* monitor =
GDK_MONITOR(g_list_model_get_item(monitors, i));
GdkMonitor* monitor = GDK_MONITOR(g_list_model_get_item(monitors, i));
#else
GdkMonitor* monitor = gdk_display_get_monitor(self->display, i);
#endif

3
engine/src/flutter/shell/platform/linux/fl_keyboard_manager.cc
View File

@ -370,8 +370,7 @@ static void fl_keyboard_manager_init(FlKeyboardManager* self) {
}
#if FLUTTER_LINUX_GTK4
self->display =
GDK_DISPLAY(g_object_ref(gdk_display_get_default()));
self->display = GDK_DISPLAY(g_object_ref(gdk_display_get_default()));
#else
self->keymap = gdk_keymap_get_for_display(gdk_display_get_default());
self->keymap_keys_changed_cb_id = g_signal_connect_swapped(

11
engine/src/flutter/shell/platform/linux/fl_text_input_handler.cc
View File

@ -367,8 +367,7 @@ static void update_im_cursor_position(FlTextInputHandler* self) {
preedit_rect.x = static_cast<int>(dest_x);
preedit_rect.y = static_cast<int>(dest_y);
#else
gtk_widget_translate_coordinates(self->widget, toplevel,
static_cast<gint>(x),
gtk_widget_translate_coordinates(self->widget, toplevel, static_cast<gint>(x),
static_cast<gint>(y), &preedit_rect.x,
&preedit_rect.y);
#endif
@ -523,12 +522,12 @@ gboolean fl_text_input_handler_filter_keypress(FlTextInputHandler* self,
return FALSE;
}
if (gtk_im_context_filter_keypress(
self->im_context,
if (gtk_im_context_filter_keypress(self->im_context,
#if FLUTTER_LINUX_GTK4
fl_key_event_get_origin(event))) {
fl_key_event_get_origin(event))) {
#else
reinterpret_cast<GdkEventKey*>(fl_key_event_get_origin(event)))) {
reinterpret_cast<GdkEventKey*>(
fl_key_event_get_origin(event)))) {
#endif
return TRUE;
}

41
engine/src/flutter/shell/platform/linux/fl_view.cc
View File

@ -568,8 +568,8 @@ static FlutterPointerDeviceKind get_device_kind_or_default(GdkEvent* event) {
}
static void motion_event_cb(FlView* self, gdouble x, gdouble y) {
GdkEvent* event = get_current_event(GTK_EVENT_CONTROLLER(
self->motion_controller));
GdkEvent* event =
get_current_event(GTK_EVENT_CONTROLLER(self->motion_controller));
if (event == nullptr) {
return;
}
@ -585,13 +585,13 @@ static void motion_event_cb(FlView* self, gdouble x, gdouble y) {
gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self));
fl_pointer_manager_handle_motion(
self->pointer_manager, gdk_event_get_time(event),
get_device_kind(event), x * scale_factor, y * scale_factor);
self->pointer_manager, gdk_event_get_time(event), get_device_kind(event),
x * scale_factor, y * scale_factor);
}
static void enter_event_cb(FlView* self, gdouble x, gdouble y) {
GdkEvent* event = get_current_event(GTK_EVENT_CONTROLLER(
self->motion_controller));
GdkEvent* event =
get_current_event(GTK_EVENT_CONTROLLER(self->motion_controller));
gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self));
fl_pointer_manager_handle_enter(
self->pointer_manager, get_event_time_or_now(event),
@ -599,23 +599,21 @@ static void enter_event_cb(FlView* self, gdouble x, gdouble y) {
}
static void leave_event_cb(FlView* self, gdouble x, gdouble y) {
GdkEvent* event = get_current_event(GTK_EVENT_CONTROLLER(
self->motion_controller));
GdkEvent* event =
get_current_event(GTK_EVENT_CONTROLLER(self->motion_controller));
gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(self));
fl_pointer_manager_handle_leave(
self->pointer_manager, get_event_time_or_now(event),
get_device_kind_or_default(event), x * scale_factor, y * scale_factor);
}
static void click_pressed_cb(FlView* self,
gint n_press,
gdouble x,
gdouble y) {
static void click_pressed_cb(FlView* self, gint n_press, gdouble x, gdouble y) {
if (n_press > 1) {
return;
}
GdkEvent* event = get_current_event(GTK_EVENT_CONTROLLER(self->click_gesture));
GdkEvent* event =
get_current_event(GTK_EVENT_CONTROLLER(self->click_gesture));
if (event == nullptr) {
return;
}
@ -637,7 +635,8 @@ static void click_released_cb(FlView* self,
gdouble x,
gdouble y) {
(void)n_press;
GdkEvent* event = get_current_event(GTK_EVENT_CONTROLLER(self->click_gesture));
GdkEvent* event =
get_current_event(GTK_EVENT_CONTROLLER(self->click_gesture));
if (event == nullptr) {
return;
}
@ -908,8 +907,7 @@ static gboolean draw_cb(FlView* self, cairo_t* cr) {
}
}
gboolean result = fl_compositor_render(
self->compositor, cr, surface);
gboolean result = fl_compositor_render(self->compositor, cr, surface);
if (self->render_context) {
gdk_gl_context_clear_current();
@ -917,8 +915,7 @@ static gboolean draw_cb(FlView* self, cairo_t* cr) {
if (!result) {
static bool logged_render_false = false;
log_once(&logged_render_false,
"draw_cb: compositor render returned false");
log_once(&logged_render_false, "draw_cb: compositor render returned false");
}
return result;
@ -1019,8 +1016,8 @@ static void fl_view_realize(GtkWidget* widget) {
#if !FLUTTER_LINUX_GTK4
static gboolean handle_key_event(FlView* self, GdkEventKey* key_event) {
g_autoptr(FlKeyEvent) event = fl_key_event_new_from_gdk_event(
reinterpret_cast<GdkEvent*>(key_event));
g_autoptr(FlKeyEvent) event =
fl_key_event_new_from_gdk_event(reinterpret_cast<GdkEvent*>(key_event));
fl_keyboard_manager_handle_event(
fl_engine_get_keyboard_manager(self->engine), event, self->cancellable,
@ -1205,8 +1202,8 @@ static void fl_view_init(FlView* self) {
#endif
#if FLUTTER_LINUX_GTK4
self->motion_controller = GTK_EVENT_CONTROLLER_MOTION(
gtk_event_controller_motion_new());
self->motion_controller =
GTK_EVENT_CONTROLLER_MOTION(gtk_event_controller_motion_new());
g_signal_connect_swapped(self->motion_controller, "motion",
G_CALLBACK(motion_event_cb), self);
g_signal_connect_swapped(self->motion_controller, "enter",

6
engine/src/flutter/shell/platform/linux/fl_window_state_monitor.cc
View File

@ -173,13 +173,11 @@ static void fl_window_state_monitor_dispose(GObject* object) {
GdkSurface* surface = gtk_native_get_surface(native);
if (surface != nullptr) {
if (self->toplevel_state_notify_cb_id != 0) {
g_signal_handler_disconnect(surface,
self->toplevel_state_notify_cb_id);
g_signal_handler_disconnect(surface, self->toplevel_state_notify_cb_id);
self->toplevel_state_notify_cb_id = 0;
}
if (self->surface_mapped_notify_cb_id != 0) {
g_signal_handler_disconnect(surface,
self->surface_mapped_notify_cb_id);
g_signal_handler_disconnect(surface, self->surface_mapped_notify_cb_id);
self->surface_mapped_notify_cb_id = 0;
}
}