diff options
| author | Mattias Andrée <m@maandree.se> | 2026-10-16 22:06:31 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2026-10-16 22:06:31 +0200 |
| commit | 17ebf437626fb21858c88421e7599e8f03661b78 (patch) | |
| tree | eb31fadc360560ed7e3c55b819ed3053ab7af70f /logical-scroll-pane.c | |
| parent | Fix No Block (diff) | |
| download | gcmap-17ebf437626fb21858c88421e7599e8f03661b78.tar.gz gcmap-17ebf437626fb21858c88421e7599e8f03661b78.tar.bz2 gcmap-17ebf437626fb21858c88421e7599e8f03661b78.tar.xz | |
Misc
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to 'logical-scroll-pane.c')
| -rw-r--r-- | logical-scroll-pane.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/logical-scroll-pane.c b/logical-scroll-pane.c index 207d34e..dd856a6 100644 --- a/logical-scroll-pane.c +++ b/logical-scroll-pane.c @@ -5,25 +5,9 @@ G_DEFINE_TYPE(LogicalScrollPane, logical_scroll_pane, GTK_TYPE_BIN) static void logical_scroll_pane_adjustment_value_changed(GtkAdjustment *adjustment, LogicalScrollPane *this) { -#if defined(__GNUC__) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wfloat-equal" -#endif - - double value; - if (this->viewport_size_is_logical) { - value = round(adjustment->value); - if (value != adjustment->value) { - gtk_adjustment_set_value(adjustment, value); - return; - } - } + (void) adjustment; if (this->child) gtk_widget_queue_draw(this->child); - -#if defined(__GNUC__) -# pragma GCC diagnostic pop -#endif } static void @@ -33,7 +17,7 @@ logical_scroll_pane_configure_adjustment(LogicalScrollPane *this, GtkAdjustment page_size = MAX(page_size, 1); pg = (double)page_size; upper = (double)MAX(content_size - page_size, 0); - value = this->viewport_size_is_logical ? round(adjustment->value) : adjustment->value; + value = adjustment->value; value = MAX(value, 0.0); value = MIN(value, upper); upper = (double)MAX(content_size, page_size); @@ -203,7 +187,7 @@ logical_scroll_pane_child_scroll(GtkWidget *widget, GdkEventScroll *event, Logic (void) widget; - switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_META_MASK)) { + switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) { case 0: switch (event->direction) { case GDK_SCROLL_LEFT: @@ -244,7 +228,7 @@ logical_scroll_pane_child_key_press(GtkWidget *widget, GdkEventKey *event, Logic (void) widget; - switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_META_MASK)) { + switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK)) { case 0: break; case GDK_SHIFT_MASK: |