[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 14/41: Replace GtkAlignment in resizer widget.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 650c469f59a2c65d77aac9cadcf28d799b9f8549
Author: Graeme Gott <graeme at gottcode.org>
Date:   Mon Aug 8 10:46:02 2016 -0400

    Replace GtkAlignment in resizer widget.
---
 panel-plugin/resizer-widget.cpp | 19 +++++++++++--------
 panel-plugin/resizer-widget.h   |  3 +--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/panel-plugin/resizer-widget.cpp b/panel-plugin/resizer-widget.cpp
index 0349957..053898b 100644
--- a/panel-plugin/resizer-widget.cpp
+++ b/panel-plugin/resizer-widget.cpp
@@ -29,12 +29,11 @@ ResizerWidget::ResizerWidget(GtkWindow* window) :
 	m_cursor(NULL),
 	m_shape(3)
 {
-	m_alignment = GTK_ALIGNMENT(gtk_alignment_new(1,0,0,0));
-
 	m_drawing = gtk_drawing_area_new();
+	gtk_widget_set_halign(m_drawing, GTK_ALIGN_END);
+	gtk_widget_set_valign(m_drawing, GTK_ALIGN_START);
 	gtk_widget_set_size_request(m_drawing, 10, 10);
 	gtk_widget_add_events(m_drawing, GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-	gtk_container_add(GTK_CONTAINER(m_alignment), m_drawing);
 
 	g_signal_connect_slot(m_drawing, "button-press-event", &ResizerWidget::on_button_press_event, this);
 	g_signal_connect_slot(m_drawing, "enter-notify-event", &ResizerWidget::on_enter_notify_event, this);
@@ -67,26 +66,30 @@ void ResizerWidget::set_corner(Corner corner)
 	switch (corner)
 	{
 	case BottomLeft:
-		gtk_alignment_set(m_alignment, 0,1,0,0);
+		gtk_widget_set_halign(m_drawing, GTK_ALIGN_START);
+		gtk_widget_set_valign(m_drawing, GTK_ALIGN_END);
 		m_shape.assign(bottomleft, bottomleft + 3);
 		m_edge = GDK_WINDOW_EDGE_SOUTH_WEST;
 		type = GDK_BOTTOM_LEFT_CORNER;
 		break;
 	case TopLeft:
-		gtk_alignment_set(m_alignment, 0,0,0,0);
+		gtk_widget_set_halign(m_drawing, GTK_ALIGN_START);
+		gtk_widget_set_valign(m_drawing, GTK_ALIGN_START);
 		m_shape.assign(topleft, topleft + 3);
 		m_edge = GDK_WINDOW_EDGE_NORTH_WEST;
 		type = GDK_TOP_LEFT_CORNER;
 		break;
 	case BottomRight:
-		gtk_alignment_set(m_alignment, 1,1,0,0);
+		gtk_widget_set_halign(m_drawing, GTK_ALIGN_END);
+		gtk_widget_set_valign(m_drawing, GTK_ALIGN_END);
 		m_shape.assign(bottomright, bottomright + 3);
 		m_edge = GDK_WINDOW_EDGE_SOUTH_EAST;
 		type = GDK_BOTTOM_RIGHT_CORNER;
 		break;
 	case TopRight:
 	default:
-		gtk_alignment_set(m_alignment, 1,0,0,0);
+		gtk_widget_set_halign(m_drawing, GTK_ALIGN_END);
+		gtk_widget_set_valign(m_drawing, GTK_ALIGN_START);
 		m_shape.assign(topright, topright + 3);
 		m_edge = GDK_WINDOW_EDGE_NORTH_EAST;
 		type = GDK_TOP_RIGHT_CORNER;
@@ -97,7 +100,7 @@ void ResizerWidget::set_corner(Corner corner)
 	{
 		gdk_cursor_unref(m_cursor);
 	}
-	m_cursor = gdk_cursor_new_for_display(gtk_widget_get_display(GTK_WIDGET(m_alignment)), type);
+	m_cursor = gdk_cursor_new_for_display(gtk_widget_get_display(GTK_WIDGET(m_drawing)), type);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/panel-plugin/resizer-widget.h b/panel-plugin/resizer-widget.h
index 509acc4..a3e7428 100644
--- a/panel-plugin/resizer-widget.h
+++ b/panel-plugin/resizer-widget.h
@@ -33,7 +33,7 @@ public:
 
 	GtkWidget* get_widget() const
 	{
-		return GTK_WIDGET(m_alignment);
+		return m_drawing;
 	}
 
 	enum Corner
@@ -53,7 +53,6 @@ private:
 
 private:
 	GtkWindow* m_window;
-	GtkAlignment* m_alignment;
 	GtkWidget* m_drawing;
 	GdkCursor* m_cursor;
 	GdkWindowEdge m_edge;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.