Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use toggle panel from makepad #184

Merged
merged 3 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ members = [
"moxin-backend",
"moxin-fake-backend",
]
exclude = [
"packaging/before-packaging-command"
]
exclude = ["packaging/before-packaging-command"]

[package]
name = "moxin"
Expand Down Expand Up @@ -130,7 +128,7 @@ section = "utils"

[package.metadata.packager.appimage]
## `curl` is needed for `moxin-runner` to auto-install wasmedge.
bins = [ "/usr/bin/curl" ]
bins = ["/usr/bin/curl"]

[package.metadata.packager.macos]
minimum_system_version = "11.0"
Expand Down
1 change: 0 additions & 1 deletion resources/icons/close_left_panel.svg

This file was deleted.

1 change: 0 additions & 1 deletion resources/icons/open_left_panel.svg

This file was deleted.

6 changes: 3 additions & 3 deletions src/chat/chat_history.rs
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
use super::chat_history_card::ChatHistoryCardWidgetRefExt;
use crate::{data::store::Store, shared::toggle_panel::TogglePanel};
use crate::data::store::Store;
use makepad_widgets::*;

live_design! {
import makepad_widgets::base::*;
import makepad_widgets::theme_desktop_dark::*;

import crate::shared::styles::*;
import crate::shared::widgets::MoxinButton;
import crate::shared::widgets::*;
import makepad_draw::shader::std::*;

import crate::chat::shared::ChatAgentAvatar;
import crate::chat::chat_history_card::ChatHistoryCard;

ICON_NEW_CHAT = dep("crate://self/resources/icons/new_chat.svg")

ChatHistory = {{ChatHistory}} {
ChatHistory = {{ChatHistory}} <MoxinTogglePanel> {
open_content = {
<View> {
width: Fill,
Expand Down
10 changes: 3 additions & 7 deletions src/chat/chat_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,15 @@ use makepad_widgets::*;

use crate::{
data::{chats::chat::ChatID, store::Store},
shared::{actions::TooltipAction, toggle_panel::TogglePanel},
shared::actions::TooltipAction,
};

live_design! {
import makepad_widgets::base::*;
import makepad_widgets::theme_desktop_dark::*;

import crate::shared::styles::*;
import crate::shared::widgets::FadeView;
import crate::shared::widgets::MoxinButton;
import crate::shared::widgets::MoxinSlider;
import crate::shared::widgets::MoxinSwitch;
import crate::shared::widgets::MoxinTextInput;
import crate::shared::widgets::*;
import makepad_draw::shader::std::*;

ICON_CLOSE_PANEL = dep("crate://self/resources/icons/close_right_panel.svg")
Expand All @@ -36,7 +32,7 @@ live_design! {
}
}

ChatParams = {{ChatParams}} {
ChatParams = {{ChatParams}} <MoxinTogglePanel> {
open_content = {
<View> {
width: Fill
Expand Down
2 changes: 0 additions & 2 deletions src/shared/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pub mod modal;
pub mod portal;
pub mod resource_imports;
pub mod styles;
pub mod toggle_panel;
pub mod tooltip;
pub mod utils;
pub mod widgets;
Expand All @@ -23,5 +22,4 @@ pub fn live_design(cx: &mut Cx) {
download_notification_popup::live_design(cx);
tooltip::live_design(cx);
desktop_buttons::live_design(cx);
toggle_panel::live_design(cx);
}
Loading
Loading