dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gimptagpopup: port to GtkStateFlags

This commit is contained in:
Simon Budig 2023-05-20 23:15:35 +02:00
parent 289999ad52
commit a100bb7fcf
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/widgets/gimptagpopup.c
View File

@ -160,8 +160,8 @@ gimp_tag_popup_init (GimpTagPopup *popup)
{ {
GtkWidget *widget = GTK_WIDGET (popup); GtkWidget *widget = GTK_WIDGET (popup);
popup->upper_arrow_state = GTK_STATE_NORMAL; popup->upper_arrow_state = GTK_STATE_FLAG_NORMAL;
popup->lower_arrow_state = GTK_STATE_NORMAL; popup->lower_arrow_state = GTK_STATE_FLAG_NORMAL;
gtk_widget_add_events (widget, gtk_widget_add_events (widget,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
@ -359,7 +359,7 @@ gimp_tag_popup_constructed (GObject *object)
if (popup_height < height) if (popup_height < height)
{ {
popup->arrows_visible = TRUE; popup->arrows_visible = TRUE;
popup->upper_arrow_state = GTK_STATE_INSENSITIVE; popup->upper_arrow_state = GTK_STATE_FLAG_INSENSITIVE;
gtk_widget_set_margin_top (popup->tag_area, gtk_widget_set_margin_top (popup->tag_area,
popup->scroll_arrow_height + 2); popup->scroll_arrow_height + 2);
@ -1194,8 +1194,8 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup,
gint step, gint step,
const GdkEvent *event) const GdkEvent *event)
{ {
GtkStateType arrow_state; GtkStateFlags arrow_state;
gint new_scroll_y = popup->scroll_y; gint new_scroll_y = popup->scroll_y;
/* If event is set, we override the step value. */ /* If event is set, we override the step value. */
if (event) if (event)
@ -1256,15 +1256,15 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup,
{ {
new_scroll_y = 0; new_scroll_y = 0;
if (arrow_state != GTK_STATE_INSENSITIVE) if (arrow_state != GTK_STATE_FLAG_INSENSITIVE)
gimp_tag_popup_stop_scrolling (popup); gimp_tag_popup_stop_scrolling (popup);
arrow_state = GTK_STATE_INSENSITIVE; arrow_state = GTK_STATE_FLAG_INSENSITIVE;
} }
else else
{ {
arrow_state = (popup->upper_arrow_prelight ? arrow_state = (popup->upper_arrow_prelight ?
GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); GTK_STATE_FLAG_PRELIGHT : GTK_STATE_FLAG_NORMAL);
} }
if (arrow_state != popup->upper_arrow_state) if (arrow_state != popup->upper_arrow_state)
@ -1279,15 +1279,15 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup,
{ {
new_scroll_y = popup->scroll_height - 1; new_scroll_y = popup->scroll_height - 1;
if (arrow_state != GTK_STATE_INSENSITIVE) if (arrow_state != GTK_STATE_FLAG_INSENSITIVE)
gimp_tag_popup_stop_scrolling (popup); gimp_tag_popup_stop_scrolling (popup);
arrow_state = GTK_STATE_INSENSITIVE; arrow_state = GTK_STATE_FLAG_INSENSITIVE;
} }
else else
{ {
arrow_state = (popup->lower_arrow_prelight ? arrow_state = (popup->lower_arrow_prelight ?
GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); GTK_STATE_FLAG_PRELIGHT : GTK_STATE_FLAG_NORMAL);
} }
if (arrow_state != popup->lower_arrow_state) if (arrow_state != popup->lower_arrow_state)
@ -1337,7 +1337,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup,
if (touchscreen_mode) if (touchscreen_mode)
popup->upper_arrow_prelight = in_arrow; popup->upper_arrow_prelight = in_arrow;
if (popup->upper_arrow_state != GTK_STATE_INSENSITIVE) if (popup->upper_arrow_state != GTK_STATE_FLAG_INSENSITIVE)
{ {
gboolean arrow_pressed = FALSE; gboolean arrow_pressed = FALSE;
@ -1402,14 +1402,14 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup,
* tag_popup, so check if the button isn't insensitive before * tag_popup, so check if the button isn't insensitive before
* changing it to something else. * changing it to something else.
*/ */
if (popup->upper_arrow_state != GTK_STATE_INSENSITIVE) if (popup->upper_arrow_state != GTK_STATE_FLAG_INSENSITIVE)
{ {
GtkStateType arrow_state = GTK_STATE_NORMAL; GtkStateFlags arrow_state = GTK_STATE_FLAG_NORMAL;
if (arrow_pressed) if (arrow_pressed)
arrow_state = GTK_STATE_ACTIVE; arrow_state = GTK_STATE_FLAG_ACTIVE;
else if (popup->upper_arrow_prelight) else if (popup->upper_arrow_prelight)
arrow_state = GTK_STATE_PRELIGHT; arrow_state = GTK_STATE_FLAG_PRELIGHT;
if (arrow_state != popup->upper_arrow_state) if (arrow_state != popup->upper_arrow_state)
{ {
@ -1438,7 +1438,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup,
if (touchscreen_mode) if (touchscreen_mode)
popup->lower_arrow_prelight = in_arrow; popup->lower_arrow_prelight = in_arrow;
if (popup->lower_arrow_state != GTK_STATE_INSENSITIVE) if (popup->lower_arrow_state != GTK_STATE_FLAG_INSENSITIVE)
{ {
gboolean arrow_pressed = FALSE; gboolean arrow_pressed = FALSE;
@ -1503,14 +1503,14 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup,
* popup, so check if the button isn't insensitive before * popup, so check if the button isn't insensitive before
* changing it to something else. * changing it to something else.
*/ */
if (popup->lower_arrow_state != GTK_STATE_INSENSITIVE) if (popup->lower_arrow_state != GTK_STATE_FLAG_INSENSITIVE)
{ {
GtkStateType arrow_state = GTK_STATE_NORMAL; GtkStateFlags arrow_state = GTK_STATE_FLAG_NORMAL;
if (arrow_pressed) if (arrow_pressed)
arrow_state = GTK_STATE_ACTIVE; arrow_state = GTK_STATE_FLAG_ACTIVE;
else if (popup->lower_arrow_prelight) else if (popup->lower_arrow_prelight)
arrow_state = GTK_STATE_PRELIGHT; arrow_state = GTK_STATE_FLAG_PRELIGHT;
if (arrow_state != popup->lower_arrow_state) if (arrow_state != popup->lower_arrow_state)
{ {

4
app/widgets/gimptagpopup.h
View File

@ -62,8 +62,8 @@ struct _GimpTagPopup
gboolean arrows_visible; gboolean arrows_visible;
gboolean upper_arrow_prelight; gboolean upper_arrow_prelight;
gboolean lower_arrow_prelight; gboolean lower_arrow_prelight;
GtkStateType upper_arrow_state; GtkStateFlags upper_arrow_state;
GtkStateType lower_arrow_state; GtkStateFlags lower_arrow_state;
gboolean smooth_scrolling; gboolean smooth_scrolling;
}; };