💄 version 0.4.3

edit styles

Author: RF-Tar-Railt

nonechat/app.py

@@ -147,11 +147,11 @@ def apply_theme_background(self) -> None:
 
         # 查找需要更新背景色的视图
         try:
-            horizontal_view = self.query_one(HorizontalView)
+            view = self.query_one(RouterView)
             if self.current_theme.dark:
-                horizontal_view.styles.background = setting.dark_bg_color
+                view.styles.background = setting.dark_bg_color
             else:
-                horizontal_view.styles.background = setting.bg_color
+                view.styles.background = setting.bg_color
         except Exception:
             # 视图可能还没有加载
             pass

nonechat/components/channel_selector.py

@@ -4,7 +4,7 @@
 
 from textual.widget import Widget
 from textual.message import Message
-from textual.widgets import Label, Button, ListItem, ListView
+from textual.widgets import Label, ListItem, ListView
 
 from ..model import Channel
 
@@ -26,32 +26,21 @@ class ChannelSelector(Widget):
     DEFAULT_CSS = """
     ChannelSelector {
         layout: vertical;
-        height: auto;
+        height: 100%;
         width: 100%;
-        border: round rgba(170, 170, 170, 0.7);
-        padding: 1;
-        margin: 1;
+        padding: 0 1;
     }
 
     ChannelSelector ListView {
-        height: auto;
+        height: 1fr;
         width: 100%;
-        max-height: 85%;
     }
 
     ChannelSelector ListItem {
         width: 100%;
         margin: 1;
-        padding: 1;
         text-align: center;
     }
-
-    ChannelSelector .add-channel-button {
-        width: 100%;
-        margin-top: 1;
-        background: darkgreen;
-        color: white;
-    }
     """
 
     def __init__(self):
@@ -64,7 +53,6 @@ def app(self) -> "Frontend":
 
     def compose(self):
         yield ListView(id="channel-list")
-        yield Button("➕ 添加频道", classes="add-channel-button", id="add-channel")
 
     async def on_mount(self):
         await self.update_channel_list()
@@ -92,11 +80,6 @@ async def update_channel_list(self):
                 else:
                     item.remove_class("current")
 
-    async def on_button_pressed(self, event: Button.Pressed):
-        """处理按钮点击事件"""
-        if event.button.id == "add-channel":
-            await self._add_new_channel()
-
     async def on_list_view_selected(self, event: ListView.Selected):
         """处理列表项选择事件"""
         if event.item and event.item.id and event.item.id.startswith("channel-"):
@@ -106,7 +89,7 @@ async def on_list_view_selected(self, event: ListView.Selected):
                     self.post_message(ChannelSelectorPressed(channel))
                     break
 
-    async def _add_new_channel(self):
+    async def add_new_channel(self):
         """添加新频道的逻辑"""
 
         # 生成随机频道ID

nonechat/components/log/__init__.py

@@ -28,11 +28,7 @@ class LogPanel(Widget):
 
     def __init__(self) -> None:
         super().__init__()
-
         self.output = RichLog(max_lines=MAX_LINES, min_width=60, wrap=True, markup=True)
-        # if setting.bg_color:
-        #     self.styles.background = setting.bg_color
-        #     self.output.styles.background = setting.bg_color
 
     @property
     def storage(self) -> "Storage":

nonechat/components/sidebar.py

@@ -2,7 +2,8 @@
 
 from textual.widget import Widget
 from textual.message import Message
-from textual.widgets import TabPane, TabbedContent
+from textual.containers import Vertical
+from textual.widgets import Button, TabPane, TabbedContent
 
 from .user_selector import UserSelector, UserSelectorPressed
 from .channel_selector import ChannelSelector, ChannelSelectorPressed
@@ -36,16 +37,39 @@ class Sidebar(Widget):
         width: 25%;
         height: 100%;
         border-right: solid rgba(170, 170, 170, 0.7);
+        layout: vertical;
+    }
+
+    TabbedContent {
+        height: 100%;
     }
 
     TabPane {
         padding: 0;
+        layout: vertical;
+        height: 100%;
+    }
+
+    .selector-container {
+        height: 1fr;
+        layout: vertical;
+    }
+
+    .button-container {
+        height: auto;
+        layout: vertical;
+        margin: 1 0;
+        align-horizontal: center;
     }
 
     UserSelector, ChannelSelector {
         margin: 1 0 0 0;
-        border: none;
-        max-height: 100%;
+        height: 1fr;
+    }
+
+    .add-button {
+        background: darkgreen;
+        color: white;
     }
     """
 
@@ -61,16 +85,29 @@ def app(self) -> "Frontend":
     def compose(self):
         with TabbedContent():
             with TabPane("👥 用户列表", id="users"):
-                yield self.user_selector
+                with Vertical(classes="selector-container"):
+                    yield self.user_selector
+                with Vertical(classes="button-container"):
+                    yield Button("➕ 添加用户", id="add-user", classes="add-button")
             with TabPane("📺 频道列表", id="channels"):
-                yield self.channel_selector
+                with Vertical(classes="selector-container"):
+                    yield self.channel_selector
+                with Vertical(classes="button-container"):
+                    yield Button("➕ 添加频道", id="add-channel", classes="add-button")
+
+    async def on_button_pressed(self, event: Button.Pressed):
+        """处理按钮点击事件"""
+        if event.button.id == "add-user":
+            await self.user_selector.add_new_user()
+        elif event.button.id == "add-channel":
+            await self.channel_selector.add_new_channel()
 
     def on_user_selector_pressed(self, event: UserSelectorPressed):
         """处理用户选择事件"""
         # 更新当前用户
         self.app.storage.set_user(event.user)
 
-        # 更新用���选择器显示
+        # 更新用户选择器显示
         # self.user_selector.update_user_list()
 
         # 向父组件发送消息

nonechat/components/user_selector.py

@@ -4,7 +4,7 @@
 
 from textual.widget import Widget
 from textual.message import Message
-from textual.widgets import Label, Button, ListItem, ListView
+from textual.widgets import Label, ListItem, ListView
 
 from ..model import User
 
@@ -26,32 +26,21 @@ class UserSelector(Widget):
     DEFAULT_CSS = """
     UserSelector {
         layout: vertical;
-        height: auto;
+        height: 100%;
         width: 100%;
-        border: round rgba(170, 170, 170, 0.7);
-        padding: 1;
-        margin: 1;
+        padding: 0 1;
     }
 
     UserSelector ListView {
-        height: auto;
+        height: 1fr;
         width: 100%;
-        max-height: 85%;
     }
 
     UserSelector ListItem {
         width: 100%;
         margin: 1;
-        padding: 1;
         text-align: center;
     }
-
-    UserSelector .add-user-button {
-        width: 100%;
-        margin-top: 1;
-        background: darkblue;
-        color: white;
-    }
     """
 
     def __init__(self):
@@ -64,7 +53,6 @@ def app(self) -> "Frontend":
 
     def compose(self):
         yield ListView(id="user-list")
-        yield Button("➕ 添加用户", classes="add-user-button", id="add-user")
 
     async def on_mount(self):
         await self.update_user_list()
@@ -87,11 +75,6 @@ async def update_user_list(self):
             else:
                 item.remove_class("current")
 
-    async def on_button_pressed(self, event: Button.Pressed):
-        """处理按钮点击事件"""
-        if event.button.id == "add-user":
-            await self._add_new_user()
-
     async def on_list_view_selected(self, event: ListView.Selected):
         """处理列表项选择事件"""
         if event.item and event.item.id and event.item.id.startswith("user-"):
@@ -101,7 +84,7 @@ async def on_list_view_selected(self, event: ListView.Selected):
                     self.post_message(UserSelectorPressed(user))
                     break
 
-    async def _add_new_user(self):
+    async def add_new_user(self):
         """添加新用户的逻辑"""
 
         # 生成随机用户ID

nonechat/views/horizontal.py

@@ -11,7 +11,7 @@
 if TYPE_CHECKING:
     from ..app import Frontend
 
-SHOW_LOG_BREAKPOINT = 120
+SHOW_LOG_BREAKPOINT = 125
 
 
 class HorizontalView(Widget):
@@ -73,12 +73,9 @@ class HorizontalView(Widget):
 
     def __init__(self):
         super().__init__()
-        # setting = self.app.setting
         self.sidebar = Sidebar()
         self.chatroom = ChatRoom()
         self.log_panel = LogPanel()
-        # if setting.bg_color:
-        #     self.styles.background = setting.bg_color
 
     @property
     def app(self) -> "Frontend":

nonechat/views/log_view.py

@@ -16,13 +16,13 @@ class LogView(Widget):
     LogView > Toolbar {
         dock: top;
     }
+    LogView > LogPanel {
+        padding: 0 1;
+    }
     """
 
     def __init__(self):
         super().__init__()
-        # setting = self.app.setting
-        # if setting.bg_color:
-        #     self.styles.background = setting.bg_color
 
     def compose(self):
         yield Toolbar(self.app.setting)

pyproject.toml

@@ -7,7 +7,7 @@ authors = [
 dependencies = [
     "textual<4.0.0,>=3.7.0",
 ]
-version = "0.4.2"
+version = "0.4.3"
 requires-python = ">=3.9, <4.0"
 readme = "README.md"
 license = {text = "MIT"}