summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Berg <bberg@redhat.com>2018-10-24 10:32:42 +0200
committerBenjamin Berg <bberg@redhat.com>2018-10-24 10:36:13 +0200
commitc9fc833ddcad35827c1354d0fc0cb73a79a5f434 (patch)
tree7b948d9322a4f61427588e63de9192ccd44198b5
parent32a6f9befa213c0fadbf32be4b71157d1b6078ce (diff)
downloadgnome-control-center-c9fc833ddcad35827c1354d0fc0cb73a79a5f434.tar.gz
display: typedef data structures related to snapping
Simply a small cleanup to typedef the relevant data structures.
-rw-r--r--panels/display/cc-display-arrangement.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/panels/display/cc-display-arrangement.c b/panels/display/cc-display-arrangement.c
index db72adca7..c345ab4e3 100644
--- a/panels/display/cc-display-arrangement.c
+++ b/panels/display/cc-display-arrangement.c
@@ -51,22 +51,22 @@ enum {
PROP_LAST
};
-enum SnapDirection {
+typedef enum {
SNAP_DIR_NONE = 0,
SNAP_DIR_X = 1 << 0,
SNAP_DIR_Y = 1 << 1,
SNAP_DIR_BOTH = (SNAP_DIR_X | SNAP_DIR_Y),
-};
+} SnapDirection;
-struct SnapData {
+typedef struct {
cairo_matrix_t to_widget;
guint major_snap_distance;
gdouble dist_x;
gdouble dist_y;
gint mon_x;
gint mon_y;
- enum SnapDirection snapped;
-};
+ SnapDirection snapped;
+} SnapData;
#define MARGIN_PX 0
#define MARGIN_MON 0.66
@@ -191,13 +191,13 @@ monitor_get_drawing_rect (CcDisplayArrangement *self,
static void
-get_snap_distance (struct SnapData *snap_data,
- gint mon_x,
- gint mon_y,
- gint new_x,
- gint new_y,
- gdouble *dist_x,
- gdouble *dist_y)
+get_snap_distance (SnapData *snap_data,
+ gint mon_x,
+ gint mon_y,
+ gint new_x,
+ gint new_y,
+ gdouble *dist_x,
+ gdouble *dist_y)
{
gdouble local_dist_x, local_dist_y;
@@ -213,16 +213,16 @@ get_snap_distance (struct SnapData *snap_data,
}
static void
-maybe_update_snap (struct SnapData *snap_data,
- gint mon_x,
- gint mon_y,
- gint new_x,
- gint new_y,
- enum SnapDirection snapped,
- enum SnapDirection major_axis,
- gint minor_unlimited)
+maybe_update_snap (SnapData *snap_data,
+ gint mon_x,
+ gint mon_y,
+ gint new_x,
+ gint new_y,
+ SnapDirection snapped,
+ SnapDirection major_axis,
+ gint minor_unlimited)
{
- enum SnapDirection update_snap = SNAP_DIR_NONE;
+ SnapDirection update_snap = SNAP_DIR_NONE;
gdouble dist_x, dist_y;
gdouble dist;
@@ -320,7 +320,7 @@ maybe_update_snap (struct SnapData *snap_data,
static void
find_best_snapping (CcDisplayConfig *config,
CcDisplayMonitor *snap_output,
- struct SnapData *snap_data)
+ SnapData *snap_data)
{
GList *outputs, *l;
gint x1, y1, x2, y2;
@@ -756,7 +756,7 @@ cc_display_arrangement_motion_notify_event (GtkWidget *widget,
CcDisplayArrangement *self = CC_DISPLAY_ARRANGEMENT (widget);
gdouble event_x, event_y;
gint mon_x, mon_y;
- struct SnapData snap_data;
+ SnapData snap_data;
g_return_val_if_fail (self->config, FALSE);
@@ -935,7 +935,7 @@ void
cc_display_config_snap_output (CcDisplayConfig *config,
CcDisplayMonitor *output)
{
- struct SnapData snap_data;
+ SnapData snap_data;
gint x, y, w, h;
if (!cc_display_monitor_is_useful (output))