aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2018-02-17 18:48:50 -0500
committerTony Crisci <tony@dubstepdish.com>2018-02-17 18:48:50 -0500
commit9a8808f8cf514076561c714293568aae4709a95a (patch)
treeda17c0415403c7790fa163ba93561a994ff2ee8c
parent9933b7ad955204208ae6e72b23c6de8bea1e436c (diff)
move direction to wlr_output_layout.h
-rw-r--r--include/wlr/types/wlr_output_layout.h8
-rw-r--r--include/wlr/util/direction.h11
2 files changed, 7 insertions, 12 deletions
diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h
index ea96c6b8..4d10720e 100644
--- a/include/wlr/types/wlr_output_layout.h
+++ b/include/wlr/types/wlr_output_layout.h
@@ -5,7 +5,6 @@
#include <wayland-util.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_output.h>
-#include <wlr/util/direction.h>
struct wlr_output_layout_state;
@@ -97,6 +96,13 @@ void wlr_output_layout_add_auto(struct wlr_output_layout *layout,
struct wlr_output *wlr_output_layout_get_center_output(
struct wlr_output_layout *layout);
+enum wlr_direction {
+ WLR_DIRECTION_UP = 0,
+ WLR_DIRECTION_DOWN = 1,
+ WLR_DIRECTION_LEFT = 2,
+ WLR_DIRECTION_RIGHT = 4,
+};
+
/**
* Get the closest adjacent output to the reference output from the reference
* point in the given direction.
diff --git a/include/wlr/util/direction.h b/include/wlr/util/direction.h
deleted file mode 100644
index b5f3a589..00000000
--- a/include/wlr/util/direction.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef WLR_UTIL_DIRECTION_H
-#define WLR_UTIL_DIRECTION_H
-
-enum wlr_direction {
- WLR_DIRECTION_UP = 0,
- WLR_DIRECTION_DOWN = 1,
- WLR_DIRECTION_LEFT = 2,
- WLR_DIRECTION_RIGHT = 4,
-};
-
-#endif