Merge branch 'dev'

Author: heng30

flymoon/src/logic/chat_session.rs

@@ -895,8 +895,8 @@ fn pretty_mcp_tool_sep(ui: Weak<AppWindow>, tool_list: Vec<String>) {
 
         entry.bot = entry
             .bot
-            .replace(MCP_TOOL_START_SEP, "```")
-            .replace(MCP_TOOL_END_SEP, "```")
+            .replace(MCP_TOOL_START_SEP, "\n```")
+            // .replace(MCP_TOOL_END_SEP, "```")
             .into();
 
         store_current_chat_session_histories!(ui).set_row_data(last_index, entry);

flymoon/src/logic/md.rs

@@ -1,11 +1,14 @@
 use crate::slint_generatedAppWindow::{
-    AppWindow, ChatEntry as UIChatEntry, Logic, MdElement as UIMdElement,
-    MdElementType as UIMdElementType, MdHeading as UIMdHeading, MdImage as UIMdImage,
-    MdListItem as UIMdListItem, MdMath as UIMdMath, MdTable as UIMdTable, MdUrl as UIMdUrl, Store,
+    AppWindow, ChatEntry as UIChatEntry, Logic, MdCodeBlock as UIMdCodeBlock,
+    MdElement as UIMdElement, MdElementType as UIMdElementType, MdHeading as UIMdHeading,
+    MdImage as UIMdImage, MdListItem as UIMdListItem, MdMath as UIMdMath, MdTable as UIMdTable,
+    MdUrl as UIMdUrl, Store,
 };
 use crate::{config::cache_dir, store_current_chat_session_histories};
 use cutil::{crypto, http};
-use dummy_markdown::{self, MdElement, MdElementType, MdHeading, MdListItem, MdTable, MdUrl};
+use dummy_markdown::{
+    self, MdCodeBlock, MdElement, MdElementType, MdHeading, MdListItem, MdTable, MdUrl,
+};
 use once_cell::sync::Lazy;
 use once_cell::sync::OnceCell;
 use slint::{ComponentHandle, Image, Model, ModelRc, SharedString, VecModel, Weak};
@@ -101,6 +104,15 @@ impl From<String> for UIMdImage {
     }
 }
 
+impl From<MdCodeBlock> for UIMdCodeBlock {
+    fn from(code_block: MdCodeBlock) -> Self {
+        UIMdCodeBlock {
+            lang: code_block.lang.into(),
+            code: code_block.code.trim().into(),
+        }
+    }
+}
+
 impl From<MdTable> for UIMdTable {
     fn from(table: MdTable) -> Self {
         UIMdTable {
@@ -135,7 +147,7 @@ impl From<MdElement> for UIMdElement {
             ty: entry.ty.into(),
             text: entry.text.into(),
             math: entry.math.into(),
-            code_block: entry.code_block.trim().to_string().into(),
+            code_block: entry.code_block.into(),
             list_item: entry.list_item.into(),
             img: entry.image_url.into(),
             heading: entry.heading.into(),

flymoon/src/logic/tr.rs

@@ -250,6 +250,7 @@ pub fn tr(text: &str) -> String {
         ),
         ("Increase font size", "增大字体"),
         ("Decrease font size", "缩小字体"),
+        ("Focus question input box", "输入框获取输入焦点"),
     ]);
 
     if let Some(txt) = items.get(text) {

flymoon/src/version.rs

@@ -1 +1 @@
-pub static VERSION: &str = "v0.1.8";
+pub static VERSION: &str = "v0.1.9";

flymoon/ui/base/skeleton.slint

@@ -15,7 +15,7 @@ export enum SkeletonType {
 component InnerItem inherits Rectangle {
     in-out property <color> active-item-color: Theme.base-background;
     in-out property <bool> enabled-active: true;
-    in-out property <float> active-opacity: 0.2;
+    in-out property <float> active-opacity: 0.4;
     in-out property <duration> active-duration: 500ms;
 
     width: root.width * 80%;
@@ -39,8 +39,8 @@ export component Skeleton inherits Rectangle {
     in-out property <color> item-color: Theme.is-dark ? Theme.secondary-background.darker(5%) : Theme.secondary-background.darker(5%);
 
     in-out property <bool> enabled-active: true;
-    in-out property <color> active-item-color: self.item-color.brighter(20%);
-    in-out property <float> active-opacity: 0.2;
+    in-out property <color> active-item-color: self.item-color.brighter(50%);
+    in-out property <float> active-opacity: 0.4;
     in-out property <duration> active-duration: 800ms;
 
     pure public function from-number(index: int) -> SkeletonType {

flymoon/ui/panel/desktop/chat/input.slint

@@ -15,6 +15,10 @@ export component Input inherits Rectangle {
     height: 130px;
     forward-focus: te;
 
+    function update-height(height: length) {
+        root.height = Math.clamp(height, 130px, Theme.default-height / 3 * 2);
+    }
+
     function ensure-show-cursor() {
         if (flick.viewport-height <= flick.height) {
             flick.viewport-y = 0;
@@ -69,6 +73,10 @@ export component Input inherits Rectangle {
                 flick := Flickable {
                     y: Theme.padding * 2;
 
+                    changed viewport-height => {
+                        root.update-height(self.viewport-height + h-btns.preferred-height);
+                    }
+
                     VerticalLayout {
                         padding: Theme.padding * 2;
 
@@ -170,7 +178,7 @@ export component Input inherits Rectangle {
                 }
             }
 
-            HorizontalLayout {
+            h-btns := HorizontalLayout {
                 height: Theme.icon-size * 2;
                 alignment: LayoutAlignment.space-between;
 

flymoon/ui/panel/desktop/chat/md.slint

@@ -1,7 +1,8 @@
 import { Theme, Store, Logic, Icons, Util } from "../../def.slint";
-import { ChatEntry, MdElementType, MdImage, MdMath, MdElement, MdUrl, MdHeading, MdUrl, MdListItem, MdTable } from "../../../store.slint";
+import { ChatEntry, MdElementType, MdImage, MdMath, MdElement, MdUrl, MdHeading, MdUrl, MdListItem, MdTable, MdCodeBlock } from "../../../store.slint";
 import { IconBtn, Label, Link, ToolTipSetting, ComponentPosition } from "../../../base/widgets.slint";
 import { SearchLink } from "../../../store.slint";
+import { ScrollView } from "std-widgets.slint";
 
 export component MdText inherits HorizontalLayout {
     in-out property text <=> txt.text;
@@ -66,7 +67,7 @@ component MdListItem inherits HorizontalLayout {
 }
 
 export component MdCodeBlock inherits HorizontalLayout {
-    in-out property <string> code;
+    in-out property <MdCodeBlock> code-block;
 
     padding-bottom: Theme.padding * 4;
 
@@ -79,39 +80,83 @@ export component MdCodeBlock inherits HorizontalLayout {
             background: Theme.code-header-color;
 
             HorizontalLayout {
-                alignment: LayoutAlignment.end;
+                alignment: LayoutAlignment.space-between;
                 padding: Theme.padding * 2;
                 padding-right: Theme.padding * 3;
+                padding-left: Theme.padding * 4;
 
-                IconBtn {
-                    icon: Icons.copy;
-                    tip: Logic.tr("copy");
-                    is-show-tip: true;
-                    gain-focus-when-clicked: false;
+                Label {
+                    text: code-block.lang;
+                }
+
+                HorizontalLayout {
+                    spacing: Theme.spacing * 4;
+
+                    IconBtn {
+                        icon: Icons.copy;
+                        tip: Logic.tr("copy");
+                        is-show-tip: true;
+                        gain-focus-when-clicked: false;
 
-                    clicked => {
-                        Logic.copy-to-clipboard(code);
+                        clicked => {
+                            Logic.copy-to-clipboard(code-block.code);
+                        }
                     }
                 }
             }
         }
 
+        // `ScrollView` could catch scroll event. However, short content should not catch scroll event
         Rectangle {
-            border-bottom-left-radius: Theme.border-radius;
-            border-bottom-right-radius: Theme.border-radius;
-            background: Theme.thirdly-background;
+            private property <float> rate: 0.5;
+            private property <bool> use-scrollview: txt-rect.preferred-height > (Theme.default-height * rate);
 
-            HorizontalLayout {
-                padding: Theme.padding * 4;
-                padding-top: Theme.padding * 2;
-
-                txt := TextInput {
-                    wrap: word-wrap;
-                    color: Theme.primary-text-color;
-                    font-size: Theme.title4-font-size;
-                    single-line: false;
-                    read-only: true;
-                    text: code;
+            height: use-scrollview ? Theme.default-height * rate : txt-rect.preferred-height;
+
+            Rectangle {
+                visible: !use-scrollview;
+                border-bottom-left-radius: Theme.border-radius;
+                border-bottom-right-radius: Theme.border-radius;
+                background: Theme.thirdly-background;
+
+                HorizontalLayout {
+                    padding: Theme.padding * 4;
+                    padding-top: Theme.padding * 2;
+
+                    TextInput {
+                        wrap: word-wrap;
+                        color: Theme.primary-text-color;
+                        font-size: Theme.title4-font-size;
+                        single-line: false;
+                        read-only: true;
+                        text: code-block.code;
+                    }
+                }
+            }
+
+            ScrollView {
+                visible: use-scrollview;
+                viewport-height: txt-rect.preferred-height;
+                height: Math.min(txt-rect.preferred-height, Theme.default-height * rate);
+
+                txt-rect := Rectangle {
+                    border-bottom-left-radius: Theme.border-radius;
+                    border-bottom-right-radius: Theme.border-radius;
+                    background: Theme.thirdly-background;
+
+                    HorizontalLayout {
+                        padding: Theme.padding * 4;
+                        padding-top: Theme.padding * 2;
+
+                        txt := TextInput {
+                            wrap: word-wrap;
+                            color: Theme.primary-text-color;
+                            font-size: Theme.title4-font-size;
+                            single-line: false;
+                            read-only: true;
+                            text: code-block.code;
+                        }
+                    }
                 }
             }
         }
@@ -284,7 +329,7 @@ export component MdDetail inherits Rectangle {
             }
 
             if entry.ty == MdElementType.CodeBlock: MdCodeBlock {
-                code: entry.code_block;
+                code-block: entry.code-block;
             }
 
             if entry.ty == MdElementType.Math: MdMath {

flymoon/ui/panel/desktop/chat/panel.slint

@@ -13,7 +13,11 @@ export component Chat inherits VerticalLayout {
     spacing: Theme.spacing * 2;
 
     Rectangle {
-        session := Session { }
+        session := Session {
+            focus-input => {
+                input.focus();
+            }
+        }
 
         if Store.input-prompt-list-entries.length > 0: InputPromptList {
             x: 0;