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.

Sign up for GitHub

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 rich HTML, fix avatar text, central style definitions #62

Merged
merged 11 commits into from
Apr 8, 2024
Merged

Use rich HTML, fix avatar text, central style definitions #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e614b3
Update makepad version to latest
kevinaboos Feb 21, 2024
ddd5e5c
WIP Html msg display no longer panics, but it still doesn't show unsu…
kevinaboos Feb 23, 2024
ab4be3c
Merge branch 'main' into rich_text_html
kevinaboos Mar 30, 2024
77b3725
WIP cannot get the HtmlOrPlaintext widget to work for some damn reason
kevinaboos Mar 30, 2024
4edb1c4
can't get plaintext messages to display in the `HtmlOrPlaintext` widg…
kevinaboos Mar 30, 2024
e5e788f
attempt to specify draw_call_group for various text labels. Doesn't w…
kevinaboos Apr 2, 2024
8898032
WIP committing this disaster, so many things are broken :(
kevinaboos Apr 4, 2024
dfc7d7d
Fix lots of things:
kevinaboos Apr 6, 2024
6b43481
Make avatar impl more canonical, and support `set_text()`
kevinaboos Apr 6, 2024
ef8d1e7
update to latest makepad that includes our changes
kevinaboos Apr 8, 2024
61b8619
clarify font comment
kevinaboos Apr 8, 2024
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
72 changes: 44 additions & 28 deletions Cargo.lock
View file
Open in desktop

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

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
[dependencies]
makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }


anyhow = "1.0"
chrono = "0.4"
clap = { version = "4.0.16", features = ["derive"] }
Expand Down
1 change: 1 addition & 0 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ impl LiveRegister for App {
crate::shared::clickable_view::live_design(cx);
crate::shared::avatar::live_design(cx);
crate::shared::text_or_image::live_design(cx);
crate::shared::html_or_plaintext::live_design(cx);

// home - chats
crate::home::home_screen::live_design(cx);
Expand Down
1 change: 0 additions & 1 deletion src/discover/discover_screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use crate::shared::clickable_view::*;
use makepad_widgets::widget::WidgetCache;
use makepad_widgets::*;

live_design! {
Expand Down
Loading