From 443b4a7c00e14a08beda301342dddb9a1dab58ba Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 26 May 2020 17:54:49 -0300
Subject: [PATCH] Fixing bugs on keypad.

---
 src/objects/keypad/keypad.c   | 16 +++++++++++-----
 src/objects/keypad/keypad.xml | 77 +++++++++++++++++++++++++++++++++++++++++------------------------------------
 src/objects/keypad/widget.c   |  5 +++--
 3 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/src/objects/keypad/keypad.c b/src/objects/keypad/keypad.c
index a95e528..6f5f4f8 100644
--- a/src/objects/keypad/keypad.c
+++ b/src/objects/keypad/keypad.c
@@ -261,17 +261,23 @@
 
         }
 
+		if(col) {
+			element->col = (unsigned short) atoi(col);
+
+			if(element->col < keypad->current.col) {
+				keypad->current.row++;
+			}
+
+		} else {
+			element->col = keypad->current.col;
+		}
+
 		if(row) {
 			element->row = (unsigned short) atoi(row);
 		} else {
 			element->row = keypad->current.row;
 		}
 
-		if(col) {
-			element->col = (unsigned short) atoi(col);
-		} else {
-			element->col = keypad->current.col;
-		}
 
 		if(width) {
 			element->width = (unsigned short) atoi(width);
diff --git a/src/objects/keypad/keypad.xml b/src/objects/keypad/keypad.xml
index 377ec84..e834429 100644
--- a/src/objects/keypad/keypad.xml
+++ b/src/objects/keypad/keypad.xml
@@ -28,147 +28,152 @@
 
 <ui>
 
-	<keypad name="lateral_keypad" position="right" width='3'>
+	<keypad name="lateral_keypad" position="right" width='6'>
 
 		<attribute name='label' translatable='yes'>Lateral keypad</attribute>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF1</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF2</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF3</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF4</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF5</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF6</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF7</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF8</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF9</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF10</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF11</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PF12</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button column='1'>
-			<attribute name="icon-name" translatable="no">go-up</attribute>
+\		<button column='2' width='2'>
+			<attribute name="icon-name" translatable="no">gtk-go-up</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button column='0'>
-			<attribute name="icon-name" translatable="no">go-back</attribute>
+		<button column='0' width='2'>
+			<attribute name="icon-name" translatable="no">gtk-go-back</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
-			<attribute name="icon-name" translatable="no">go-top</attribute>
+		<button width='2'>
+			<attribute name="icon-name" translatable="no">gtk-goto-top</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
-			<attribute name="icon-name" translatable="no">go-forward</attribute>
+		<button width='2'>
+			<attribute name="icon-name" translatable="no">gtk-go-forward</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button column='2' width='2'>
+			<attribute name="icon-name" translatable="no">gtk-go-down</attribute>
+			<attribute name="action"></attribute>
+		</button>
+
+		<button width='2' column='0'>
 			<attribute name="label" translatable="no">PA1</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PA2</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='2'>
 			<attribute name="label" translatable="no">PA3</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
-			<attribute name="icon-name" translatable="no">goto-first</attribute>
+		<button width='3'>
+			<attribute name="icon-name" translatable="no">go-first</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
-			<attribute name="icon-name" translatable="no">goto-last</attribute>
+		<button width='3'>
+			<attribute name="icon-name" translatable="no">go-last</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='3'>
 			<attribute name="label" translatable="Yes">Clear</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='3'>
 			<attribute name="label" translatable="Yes">Reset</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='3'>
 			<attribute name="label" translatable="Yes">Erase\nEOF</attribute>
 			<attribute name="action"></attribute>
 		</button>
 		
-		<button>
+		<button width='3'>
 			<attribute name="label" translatable="Yes">Erase\nInput</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='3'>
 			<attribute name="label" translatable="Yes">Attn</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
+		<button width='3'>
 			<attribute name="label" translatable="Yes">Break</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
-		<button>
-			<attribute name="icon-name" translatable="no">ok</attribute>
+		<button width='6'>
+			<attribute name="icon-name" translatable="no">gtk-ok</attribute>
 			<attribute name="action"></attribute>
 		</button>
 
diff --git a/src/objects/keypad/widget.c b/src/objects/keypad/widget.c
index 216dc3e..a8e321c 100644
--- a/src/objects/keypad/widget.c
+++ b/src/objects/keypad/widget.c
@@ -38,8 +38,8 @@
  	if(element->icon_name) {
 		button = gtk_button_new_from_icon_name(element->icon_name,GTK_ICON_SIZE_SMALL_TOOLBAR);
  	} else if(element->label) {
-		button = gtk_button_new();
-		gtk_button_set_(element->label);
+ 		g_autofree gchar * label = g_strcompress(element->label);
+		button = gtk_button_new_with_label(label);
  	} else {
 		button = gtk_button_new();
  	}
@@ -59,6 +59,7 @@
 
 	GtkWidget * grid = gtk_grid_new();
 	gtk_grid_set_column_homogeneous(GTK_GRID(grid),TRUE);
+	gtk_grid_set_row_homogeneous(GTK_GRID(grid),TRUE);
 
 	g_list_foreach(PW_KEYPAD_MODEL(model)->elements,(GFunc) create_child, grid);
 
--
libgit2 0.21.2