From c82eddaf769c3e93e08c30c965d18251b08ca7bc Mon Sep 17 00:00:00 2001
From: John Tsiombikas <nuclear@member.fsf.org>
Date: Wed, 7 Jun 2023 23:56:18 +0300
Subject: [PATCH] moving along

---
 src/rtk.c     |   37 ++++++++++++++++++++++++++++++++-----
 src/scr_mod.c |    2 ++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/rtk.c b/src/rtk.c
index abd4244..bdfca65 100644
--- a/src/rtk.c
+++ b/src/rtk.c
@@ -361,6 +361,11 @@ static void calc_widget_rect(rtk_widget *w, rtk_rect *rect)
 	}
 
 	switch(w->type) {
+	case RTK_WIN:
+		rect->width = w->any.width;
+		rect->height = w->any.height;
+		break;
+
 	case RTK_BUTTON:
 		if(w->bn.icon) {
 			rect->width = w->bn.icon->width + OFFS * 2;
@@ -384,9 +389,9 @@ static void calc_widget_rect(rtk_widget *w, rtk_rect *rect)
 	case RTK_SEP:
 		if(w->any.par->win.layout == RTK_VBOX) {
 			rect->width = w->any.par->any.width - PAD * 2;
-			rect->height = (PAD + BEVELSZ) * 2;
+			rect->height = PAD * 4 + BEVELSZ * 2;
 		} else if(w->any.par->win.layout == RTK_HBOX) {
-			rect->width = (PAD + BEVELSZ) * 2;
+			rect->width = PAD * 4 + BEVELSZ * 2;
 			rect->height = w->any.par->any.height - PAD * 2;
 		} else {
 			rect->width = rect->height = 0;
@@ -422,6 +427,7 @@ static void calc_layout(rtk_widget *w)
 {
 	int x, y;
 	rtk_widget *c;
+	rtk_rect rect;
 
 	if(w->any.type == RTK_WIN && w->win.layout != RTK_NONE) {
 		x = y = PAD;
@@ -432,15 +438,19 @@ static void calc_layout(rtk_widget *w)
 			calc_layout(c);
 
 			if(w->win.layout == RTK_VBOX) {
-				y += c->any.height + PAD;
+				y += c->any.height + PAD * 2;
 			} else {
-				x += c->any.width + PAD;
+				x += c->any.width + PAD * 2;
 			}
 
 			c = c->any.next;
 		}
 	}
 
+	calc_widget_rect(w, &rect);
+	w->any.width = rect.width;
+	w->any.height = rect.height;
+
 	w->any.flags = (w->any.flags & ~GEOMCHG) | DIRTY;
 }
 
@@ -501,7 +511,7 @@ static void abs_pos(rtk_widget *w, int *xpos, int *ypos)
 
 #define COL_BG		0xff666666
 #define COL_LBEV	0xffaaaaaa
-#define COL_SBEV	0xff333333
+#define COL_SBEV	0xff222222
 #define COL_TEXT	0xff000000
 
 static void hline(int x, int y, int sz, uint32_t col)
@@ -600,8 +610,25 @@ static void draw_separator(rtk_widget *w)
 	rtk_widget *win = w->any.par;
 	rtk_rect rect;
 
+	if(!win) return;
+
 	widget_rect(w, &rect);
 	abs_pos(w, &rect.x, &rect.y);
 
+	switch(win->win.layout) {
+	case RTK_VBOX:
+		rect.y += PAD * 2;
+		rect.height = 2;
+		break;
+
+	case RTK_HBOX:
+		rect.x += PAD * 2;
+		rect.width = 2;
+		break;
+
+	default:
+		break;
+	}
+
 	draw_frame(&rect, FRM_INSET);
 }
diff --git a/src/scr_mod.c b/src/scr_mod.c
index 29ce348..9dfedc7 100644
--- a/src/scr_mod.c
+++ b/src/scr_mod.c
@@ -84,6 +84,8 @@ static int mdl_init(void)
 		if(tbn_icon_name[i]) {
 			tbn_icons[i] = rtk_define_icon(icons, tbn_icon_name[i],
 					tbn_icon_pos[i][0], tbn_icon_pos[i][1], 16, 16);
+		} else {
+			tbn_icons[i] = 0;
 		}
 	}
 
-- 
1.7.10.4