summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2015-09-09 18:18:35 -0400
committerWilliam Hua <william.hua@canonical.com>2015-09-09 18:26:28 -0400
commit418765d26de020b0938b66d26428794df0aeb39e (patch)
treedcae1e3f6bba420fd23f06233a2537c4ba3ee7bf
parentf8a34b2819da53b6cc49fe60a7709eb185194ec9 (diff)
downloadgtk+-wip/attachment-rectangle.tar.gz
gdk: add more alignment options to GdkAttachmentOptions.wip/attachment-rectangle
-rw-r--r--gdk/gdkwindow.h38
1 files changed, 23 insertions, 15 deletions
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 0cf614be29..ae1992e208 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -328,30 +328,38 @@ typedef enum
* @GDK_ATTACHMENT_ATTACH_BOTTOM_EDGE: place below.
* @GDK_ATTACHMENT_ATTACH_ANY_EDGE: place along any edge.
* @GDK_ATTACHMENT_ATTACH_MASK: bit mask.
- * @GDK_ATTACHMENT_ATTACH_OPPOSITE_EDGE: use opposite edge if lacking space.
+ * @GDK_ATTACHMENT_ATTACH_OPPOSITE_EDGE: place along opposite edge if lacking space.
* @GDK_ATTACHMENT_ALIGN_TOP_EDGES: align top edges.
+ * @GDK_ATTACHMENT_ALIGN_BOTTOM_EDGES: align bottom edges.
+ * @GDK_ATTACHMENT_VERTICAL_ALIGN_MASK: bit mask.
* @GDK_ATTACHMENT_ALIGN_LEFT_EDGES: align left edges.
* @GDK_ATTACHMENT_ALIGN_RIGHT_EDGES: align right edges.
- * @GDK_ATTACHMENT_ALIGN_BOTTOM_EDGES: align bottom edges.
+ * @GDK_ATTACHMENT_HORIZONTAL_ALIGN_MASK: bit mask.
* @GDK_ATTACHMENT_ALIGN_MASK: bit mask.
+ * @GDK_ATTACHMENT_VERTICAL_ALIGN_OPPOSITE_EDGES: vertically align opposite edges if lacking space.
+ * @GDK_ATTACHMENT_HORIZONTAL_ALIGN_OPPOSITE_EDGES: horizontally align opposite edges if lacking space.
*
* Hints for placing a popup menu relative to an attachment rectangle.
*/
typedef enum
{
- GDK_ATTACHMENT_ATTACH_NO_EDGE = 0x1,
- GDK_ATTACHMENT_ATTACH_TOP_EDGE = 0x2,
- GDK_ATTACHMENT_ATTACH_LEFT_EDGE = 0x3,
- GDK_ATTACHMENT_ATTACH_RIGHT_EDGE = 0x4,
- GDK_ATTACHMENT_ATTACH_BOTTOM_EDGE = 0x5,
- GDK_ATTACHMENT_ATTACH_ANY_EDGE = 0x6,
- GDK_ATTACHMENT_ATTACH_MASK = 0x7,
- GDK_ATTACHMENT_ATTACH_OPPOSITE_EDGE = 0x8,
- GDK_ATTACHMENT_ALIGN_TOP_EDGES = 0x10,
- GDK_ATTACHMENT_ALIGN_LEFT_EDGES = 0x20,
- GDK_ATTACHMENT_ALIGN_RIGHT_EDGES = 0x30,
- GDK_ATTACHMENT_ALIGN_BOTTOM_EDGES = 0x40,
- GDK_ATTACHMENT_ALIGN_MASK = 0x70
+ GDK_ATTACHMENT_ATTACH_NO_EDGE = 0x1,
+ GDK_ATTACHMENT_ATTACH_TOP_EDGE = 0x2,
+ GDK_ATTACHMENT_ATTACH_LEFT_EDGE = 0x3,
+ GDK_ATTACHMENT_ATTACH_RIGHT_EDGE = 0x4,
+ GDK_ATTACHMENT_ATTACH_BOTTOM_EDGE = 0x5,
+ GDK_ATTACHMENT_ATTACH_ANY_EDGE = 0x6,
+ GDK_ATTACHMENT_ATTACH_MASK = 0x7,
+ GDK_ATTACHMENT_ATTACH_OPPOSITE_EDGE = 0x8,
+ GDK_ATTACHMENT_ALIGN_TOP_EDGES = 0x10,
+ GDK_ATTACHMENT_ALIGN_BOTTOM_EDGES = 0x20,
+ GDK_ATTACHMENT_VERTICAL_ALIGN_MASK = 0x30,
+ GDK_ATTACHMENT_ALIGN_LEFT_EDGES = 0x40,
+ GDK_ATTACHMENT_ALIGN_RIGHT_EDGES = 0x80,
+ GDK_ATTACHMENT_HORIZONTAL_ALIGN_MASK = 0xC0,
+ GDK_ATTACHMENT_ALIGN_MASK = 0xF0,
+ GDK_ATTACHMENT_VERTICAL_ALIGN_OPPOSITE_EDGES = 0x100,
+ GDK_ATTACHMENT_HORIZONTAL_ALIGN_OPPOSITE_EDGES = 0x200
} GdkAttachmentOptions;
/**