feat: support close tab

Author: lc-soft

src/ui/components/frame-tab.c

@@ -13,6 +13,14 @@ typedef struct FrameTabRec_ {
 
 static LCUI_WidgetPrototype frame_tab_proto;
 
+static void FrameTab_OnClose(LCUI_Widget w, LCUI_WidgetEvent e, void *arg)
+{
+	LCUI_WidgetEventRec ev;
+
+	LCUI_InitWidgetEvent(&ev, "TabClose");
+	Widget_TriggerEvent(e->data, &ev, NULL);
+}
+
 static void FrameTab_OnInit(LCUI_Widget w)
 {
 	FrameTab self;
@@ -33,6 +41,7 @@ static void FrameTab_OnInit(LCUI_Widget w)
 	Widget_Append(w, self->text);
 	Widget_Append(w, self->close);
 	Widget_AddClass(w, "c-frame-tab");
+	Widget_BindEvent(self->close, "click", FrameTab_OnClose, w, NULL);
 }
 
 static void FrameTab_OnDestroy(LCUI_Widget w)

src/ui/stylesheets/_variables.scss

@@ -77,9 +77,10 @@ $primary-text-color: #202124;
 $secondary-text-color: #5f6368;
 $green: #28a745;
 
-$navbar-btn-bg-hover: $gray-200;
-$navbar-btn-bg-active: $gray-300;
+$browser-tabbar-bg: $gray-300;
+$navbar-btn-bg-hover: $gray-300;
+$navbar-btn-bg-active: $gray-400;
 $border-color: $gray-200;
 $navbar-input-bg: $gray-200;
 $navbar-input-bg-hover: $gray-300;
-$navbar-input-bg-focus: #fff;
+$navbar-input-bg-focus: #fff;

src/ui/stylesheets/components/_frame-tab.scss

@@ -59,7 +59,7 @@
   }
 
   &:hover {
-    background-color: rgba(255, 255, 255, 0.5);
+    background-color: rgba(255, 255, 255, 0.6);
   }
 
   &.active {

src/ui/stylesheets/views/_browser.scss

@@ -3,5 +3,6 @@
 }
 
 .v-browser__tabbar {
-  background-color: $gray-300;
+  background-color: $browser-tabbar-bg;
+  padding: 8px 8px 0 8px;
 }

src/ui/views/browser.c

@@ -43,6 +43,7 @@ static void BrowserView_OnDestroy(LCUI_Widget w)
 	BrowserView self;
 
 	self = Widget_GetData(w, browser_proto);
+	LinkedList_ClearData(&self->pages, free);
 }
 
 static void BrowserView_OnPageTabClick(LCUI_Widget w, LCUI_WidgetEvent e,
@@ -54,6 +55,15 @@ static void BrowserView_OnPageTabClick(LCUI_Widget w, LCUI_WidgetEvent e,
 	BrowserView_Active(page->browser, page->id);
 }
 
+static void BrowserView_OnPageTabClose(LCUI_Widget w, LCUI_WidgetEvent e,
+				       void *arg)
+{
+	Page page;
+
+	page = e->data;
+	BrowserView_Close(page->browser, page->id);
+}
+
 static void BrowserView_OnPageLoad(LCUI_Widget w, LCUI_WidgetEvent e, void *arg)
 {
 	Page page;
@@ -99,6 +109,8 @@ int BrowserView_Load(LCUI_Widget w, const char *path)
 	Widget_Append(self->tabbar, page->tab);
 	Widget_BindEvent(page->tab, "mousedown", BrowserView_OnPageTabClick,
 			 page, NULL);
+	Widget_BindEvent(page->tab, "TabClose", BrowserView_OnPageTabClose,
+			 page, NULL);
 	Widget_BindEvent(page->frame, "PageLoad", BrowserView_OnPageLoad, page,
 			 NULL);
 	Widget_BindEvent(page->frame, "PageLoaded", BrowserView_OnPageLoaded,
@@ -135,6 +147,42 @@ LCUI_BOOL BrowserView_Active(LCUI_Widget w, int id)
 	return TRUE;
 }
 
+LCUI_BOOL BrowserView_Close(LCUI_Widget w, int id)
+{
+	Page page;
+	BrowserView self;
+	LinkedListNode *node;
+
+	self = Widget_GetData(w, browser_proto);
+	for (LinkedList_Each(node, &self->pages)) {
+		page = node->data;
+		if (page->id != id) {
+			continue;
+		}
+		Widget_Destroy(page->tab);
+		Widget_Destroy(page->frame);
+		if (self->current_page == page) {
+			if (node->next) {
+				page = node->next->data;
+			} else if (node->prev) {
+				page = node->prev->data;
+			}
+			self->current_page = page;
+			if (page) {
+				Widget_AddClass(page->tab, "active");
+				Widget_Append(w, page->frame);
+			}
+		}
+		LinkedList_Unlink(&self->pages, node);
+		free(node->data);
+		if (self->pages.length < 1) {
+			LCUI_Quit();
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
 void UI_InitBrowserView(void)
 {
 	browser_proto = LCUIWidget_NewPrototype("browser", NULL);

src/ui/views/browser.h

@@ -3,4 +3,6 @@ extern int BrowserView_Load(LCUI_Widget w, const char *path);
 
 extern LCUI_BOOL BrowserView_Active(LCUI_Widget w, int id);
 
+extern LCUI_BOOL BrowserView_Close(LCUI_Widget w, int id);
+
 extern void UI_InitBrowserView(void);

src/ui/views/welcome.c

@@ -27,7 +27,7 @@ static void WelcomeView_OnInit(LCUI_Widget w)
 	Widget_AddData(w, welcome_proto, 0);
 	Widget_AddClass(w, "v-welcome");
 	Widget_SetTitleW(w, L"Welcome!");
-	LCUI_SetTimeout(1000, WelcomeView_OnTimer, w);
+	LCUI_SetTimeout(500, WelcomeView_OnTimer, w);
 }
 
 void UI_InitWelcomeView(void)