varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-gtk: selection improvements

Browse Source 
Deny gesture if clicking out of our charting area. Don't short circuit if
we need to draw selection areas.
This commit is contained in:
Christian Hergert
2023-06-30 14:21:03 -07:00
parent 44fc3f7eac
commit 160f23e650
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/libsysprof-gtk/sysprof-tracks-view.c
View File

@ -108,6 +108,12 @@ sysprof_tracks_view_drag_begin_cb (SysprofTracksView *self,
g_assert (SYSPROF_IS_TRACKS_VIEW (self)); g_assert (SYSPROF_IS_TRACKS_VIEW (self));
g_assert (GTK_IS_GESTURE_DRAG (drag)); g_assert (GTK_IS_GESTURE_DRAG (drag));
if (start_x < gtk_widget_get_width (self->top_left))
{
gtk_gesture_set_state (GTK_GESTURE (drag), GTK_EVENT_SEQUENCE_DENIED);
return;
}
self->drag_start_x = start_x; self->drag_start_x = start_x;
self->drag_start_y = start_y; self->drag_start_y = start_y;
self->drag_offset_x = 0; self->drag_offset_x = 0;
@ -167,18 +173,18 @@ get_selected_area (SysprofTracksView *self,
if (self->in_drag_selection && self->drag_offset_x != .0) if (self->in_drag_selection && self->drag_offset_x != .0)
{ {
graphene_rect_t sel;
*area = GRAPHENE_RECT_INIT (gtk_widget_get_width (self->top_left), *area = GRAPHENE_RECT_INIT (gtk_widget_get_width (self->top_left),
0, 0,
gtk_widget_get_width (GTK_WIDGET (self)) - gtk_widget_get_width (self->top_left), gtk_widget_get_width (GTK_WIDGET (self)) - gtk_widget_get_width (self->top_left),
gtk_widget_get_height (GTK_WIDGET (self))); gtk_widget_get_height (GTK_WIDGET (self)));
*selection = GRAPHENE_RECT_INIT (self->drag_start_x, sel = GRAPHENE_RECT_INIT (self->drag_offset_x >= 0 ? self->drag_start_x : self->drag_start_x + self->drag_offset_x,
0, 0,
self->drag_offset_x, ABS (self->drag_offset_x),
gtk_widget_get_height (GTK_WIDGET (self))); gtk_widget_get_height (GTK_WIDGET (self)));
graphene_rect_normalize (selection);
graphene_rect_intersection (area, selection, selection);
return TRUE; return graphene_rect_intersection (area, &sel, selection);
} }
/* If selected range == visible range, then there is no selection */ /* If selected range == visible range, then there is no selection */
@ -206,12 +212,6 @@ sysprof_tracks_view_snapshot (GtkWidget *widget,
GTK_WIDGET_CLASS (sysprof_tracks_view_parent_class)->snapshot (widget, snapshot); GTK_WIDGET_CLASS (sysprof_tracks_view_parent_class)->snapshot (widget, snapshot);
if (self->motion_x == -1 && self->motion_y == -1)
return;
if (self->motion_x < gtk_widget_get_width (self->top_left))
return;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_BEGIN_IGNORE_DEPRECATIONS
{ {
GtkStyleContext *style_context = gtk_widget_get_style_context (GTK_WIDGET (self)); GtkStyleContext *style_context = gtk_widget_get_style_context (GTK_WIDGET (self));
@ -242,10 +242,13 @@ G_GNUC_END_IGNORE_DEPRECATIONS
area.size.height)); area.size.height));
} }
gtk_snapshot_append_color (snapshot, if (self->motion_x != -1 &&
&line_color, self->motion_y != -1 &&
&GRAPHENE_RECT_INIT (self->motion_x, 0, 1, self->motion_x > gtk_widget_get_width (self->top_left))
gtk_widget_get_height (GTK_WIDGET (self)))); gtk_snapshot_append_color (snapshot,
&line_color,
&GRAPHENE_RECT_INIT (self->motion_x, 0, 1,
gtk_widget_get_height (GTK_WIDGET (self))));
} }
static void static void