Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Clean up comments and names in FlView #56084

Merged
merged 5 commits into from
Oct 25, 2024
Merged

Clean up comments and names in FlView #56084

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cbb7623
Remove widget from class as not required outside of the creation method
robert-ancell Oct 24, 2024
460ac16
Update class field documentation and ordering
robert-ancell Oct 24, 2024
d4e23a8
Rename signal subscription, as handler is used for things that handle…
robert-ancell Oct 24, 2024
109e9e2
Document managers
robert-ancell Oct 24, 2024
a6a688c
Remove unused include
robert-ancell Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions shell/platform/linux/fl_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "flutter/common/constants.h"
#include "flutter/shell/platform/linux/fl_accessible_node.h"
#include "flutter/shell/platform/linux/fl_engine_private.h"
#include "flutter/shell/platform/linux/fl_framebuffer.h"
#include "flutter/shell/platform/linux/fl_key_event.h"
#include "flutter/shell/platform/linux/fl_keyboard_handler.h"
#include "flutter/shell/platform/linux/fl_keyboard_manager.h"
Expand All @@ -36,16 +35,19 @@ static constexpr int kMicrosecondsPerMillisecond = 1000;
struct _FlView {
GtkBox parent_instance;

// The widget rendering the Flutter view.
GtkGLArea* gl_area;

// Engine this view is showing.
FlEngine* engine;

// Handler for engine restart signal.
guint on_pre_engine_restart_handler;
// Signal subscription for engine restarts.
guint on_pre_engine_restart_cb_id;

// ID for this view.
FlutterViewId view_id;

// Rendering output.
// Object that performs the view rendering.
FlRendererGdk* renderer;

// Background color.
Expand All @@ -60,8 +62,10 @@ struct _FlView {
// Monitor to track window state.
FlWindowStateMonitor* window_state_monitor;

// Manages scrolling events.
FlScrollingManager* scrolling_manager;

// Manages keyboard events.
FlKeyboardManager* keyboard_manager;

// Flutter system channel handlers.
Expand All @@ -70,10 +74,7 @@ struct _FlView {
FlMouseCursorHandler* mouse_cursor_handler;
FlPlatformHandler* platform_handler;

GtkWidget* event_box;
GtkGLArea* gl_area;

// Tracks whether mouse pointer is inside the view.
// TRUE if the mouse pointer is inside the view.
gboolean pointer_inside;

// Accessible tree from Flutter, exposed as an AtkPlug.
Expand Down Expand Up @@ -671,10 +672,10 @@ static void fl_view_dispose(GObject* object) {
nullptr);
}

if (self->on_pre_engine_restart_handler != 0) {
if (self->on_pre_engine_restart_cb_id != 0) {
g_signal_handler_disconnect(self->engine,
self->on_pre_engine_restart_handler);
self->on_pre_engine_restart_handler = 0;
self->on_pre_engine_restart_cb_id);
self->on_pre_engine_restart_cb_id = 0;
}

g_clear_object(&self->engine);
Expand Down Expand Up @@ -749,35 +750,35 @@ static void fl_view_init(FlView* self) {
.red = 0.0, .green = 0.0, .blue = 0.0, .alpha = 1.0};
self->background_color = gdk_rgba_copy(&default_background);

self->event_box = gtk_event_box_new();
gtk_widget_set_hexpand(self->event_box, TRUE);
gtk_widget_set_vexpand(self->event_box, TRUE);
gtk_container_add(GTK_CONTAINER(self), self->event_box);
gtk_widget_show(self->event_box);
gtk_widget_add_events(self->event_box,
GtkWidget* event_box = gtk_event_box_new();
gtk_widget_set_hexpand(event_box, TRUE);
gtk_widget_set_vexpand(event_box, TRUE);
gtk_container_add(GTK_CONTAINER(self), event_box);
gtk_widget_show(event_box);
gtk_widget_add_events(event_box,
GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK |
GDK_SMOOTH_SCROLL_MASK);

g_signal_connect_swapped(self->event_box, "button-press-event",
g_signal_connect_swapped(event_box, "button-press-event",
G_CALLBACK(button_press_event_cb), self);
g_signal_connect_swapped(self->event_box, "button-release-event",
g_signal_connect_swapped(event_box, "button-release-event",
G_CALLBACK(button_release_event_cb), self);
g_signal_connect_swapped(self->event_box, "scroll-event",
g_signal_connect_swapped(event_box, "scroll-event",
G_CALLBACK(scroll_event_cb), self);
g_signal_connect_swapped(self->event_box, "motion-notify-event",
g_signal_connect_swapped(event_box, "motion-notify-event",
G_CALLBACK(motion_notify_event_cb), self);
g_signal_connect_swapped(self->event_box, "enter-notify-event",
g_signal_connect_swapped(event_box, "enter-notify-event",
G_CALLBACK(enter_notify_event_cb), self);
g_signal_connect_swapped(self->event_box, "leave-notify-event",
g_signal_connect_swapped(event_box, "leave-notify-event",
G_CALLBACK(leave_notify_event_cb), self);
GtkGesture* zoom = gtk_gesture_zoom_new(self->event_box);
GtkGesture* zoom = gtk_gesture_zoom_new(event_box);
g_signal_connect_swapped(zoom, "begin", G_CALLBACK(gesture_zoom_begin_cb),
self);
g_signal_connect_swapped(zoom, "scale-changed",
G_CALLBACK(gesture_zoom_update_cb), self);
g_signal_connect_swapped(zoom, "end", G_CALLBACK(gesture_zoom_end_cb), self);
GtkGesture* rotate = gtk_gesture_rotate_new(self->event_box);
GtkGesture* rotate = gtk_gesture_rotate_new(event_box);
g_signal_connect_swapped(rotate, "begin",
G_CALLBACK(gesture_rotation_begin_cb), self);
g_signal_connect_swapped(rotate, "angle-changed",
Expand All @@ -788,7 +789,7 @@ static void fl_view_init(FlView* self) {
self->gl_area = GTK_GL_AREA(gtk_gl_area_new());
gtk_gl_area_set_has_alpha(self->gl_area, TRUE);
gtk_widget_show(GTK_WIDGET(self->gl_area));
gtk_container_add(GTK_CONTAINER(self->event_box), GTK_WIDGET(self->gl_area));
gtk_container_add(GTK_CONTAINER(event_box), GTK_WIDGET(self->gl_area));
g_signal_connect_swapped(self->gl_area, "render", G_CALLBACK(render_cb),
self);

Expand All @@ -808,7 +809,7 @@ G_MODULE_EXPORT FlView* fl_view_new(FlDartProject* project) {

fl_engine_set_update_semantics_handler(self->engine, update_semantics_cb,
self, nullptr);
self->on_pre_engine_restart_handler =
self->on_pre_engine_restart_cb_id =
g_signal_connect_swapped(engine, "on-pre-engine-restart",
G_CALLBACK(on_pre_engine_restart_cb), self);

Expand All @@ -830,7 +831,7 @@ G_MODULE_EXPORT FlView* fl_view_new_for_engine(FlEngine* engine) {
g_assert(FL_IS_RENDERER_GDK(renderer));
self->renderer = FL_RENDERER_GDK(g_object_ref(renderer));

self->on_pre_engine_restart_handler =
self->on_pre_engine_restart_cb_id =
g_signal_connect_swapped(engine, "on-pre-engine-restart",
G_CALLBACK(on_pre_engine_restart_cb), self);

Expand Down