Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b39e408
change widget and import sync_indicator
Guocork Jun 16, 2025
904f77f
fix send action
Guocork Jun 17, 2025
8de5c8f
Merge branch 'main' into fix-issue-509
Guocork Jul 1, 2025
efcd9cf
resolve reflect
Guocork Jul 1, 2025
5fa1d91
logic
Guocork Jul 1, 2025
0203e5c
update makepad-widget and use loading spinner
Guocork Jul 1, 2025
fac22f5
Restore AdaptiveView
alanpoon Jul 9, 2025
1c3cea9
Move to SyncStatusAction
alanpoon Jul 9, 2025
e2a7688
cache RoomsListHeader, set_sync visiblity
alanpoon Jul 9, 2025
f46cd86
Merge branch 'main' into sync_indicator#509
alanpoon Jul 9, 2025
9648a32
cleanup
alanpoon Jul 9, 2025
dbd5bcd
cleanup
alanpoon Jul 9, 2025
f57e6b9
cleanup
alanpoon Jul 10, 2025
5dbe193
remove SyncStatusAction::IsSyncing
alanpoon Jul 11, 2025
2839b41
header_title
alanpoon Jul 11, 2025
6731df1
Merge branch 'main' into fix-issue-509
alanpoon Jul 11, 2025
8b9a7da
Merge branch 'main' into fix-issue-509
alanpoon Jul 11, 2025
97a9157
Added consts and doc
alanpoon Jul 11, 2025
537f9ab
remove whitespace
alanpoon Jul 14, 2025
198f76f
Merge branch 'main' into fix-issue-509
alanpoon Jul 15, 2025
0fa9fbf
update makepad
alanpoon Jul 15, 2025
406c71a
stage cargo.lock
alanpoon Jul 15, 2025
3b9e0e6
added restore_status_view
alanpoon Jul 17, 2025
09285a3
minor edit for invite_screen
alanpoon Jul 17, 2025
73c781a
change to room_name_or_id
alanpoon Jul 18, 2025
459e637
combine restore_status_view
alanpoon Jul 21, 2025
ca32094
Merge branch 'main' into fix-issue-509
ZhangHanDong Jul 21, 2025
14beedf
restore_status_spinner improvement
alanpoon Jul 21, 2025
7066232
fix invitescreen spinner error
alanpoon Jul 21, 2025
510438b
Merge branch 'fix-issue-509' of https://github.com/Guocork/robrix int…
alanpoon Jul 21, 2025
3ef61d9
Add RestoreViewRef
alanpoon Jul 23, 2025
2afcced
fix format
alanpoon Jul 23, 2025
73b1f72
revert cargo
alanpoon Jul 23, 2025
e0a7793
Merge branch 'main' into fix-issue-509
alanpoon Jul 23, 2025
52e078b
remove set_content in draw
alanpoon Jul 28, 2025
e180adf
Added Header doc
alanpoon Jul 28, 2025
6ffd111
Merge branch 'fix-issue-509' of https://github.com/Guocork/robrix int…
alanpoon Jul 28, 2025
2e693db
Merge branch 'main' into fix-issue-509
alanpoon Jul 28, 2025
a71fe75
Clean up and simplify restore_status_view
kevinaboos Jul 28, 2025
b04665b
Fix typo
kevinaboos Jul 28, 2025
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
68 changes: 34 additions & 34 deletions Cargo.lock

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

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ version = "0.0.1-pre-alpha-3"
metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="

[dependencies]
# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev" }
makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "portal_list_is_filling_viewport" }

makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev" }
#makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "portal_list_is_filling_viewport" }

## Including this crate automatically configures all `robius-*` crates to work with Makepad.
robius-use-makepad = "0.1.1"
Expand Down
2 changes: 1 addition & 1 deletion src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ impl MatchEvent for App {
cx.widget_action(
self.ui.widget_uid(),
&Scope::default().path,
StackNavigationAction::NavigateTo(live_id!(main_content_view))
StackNavigationAction::Push(live_id!(main_content_view))
);
self.ui.redraw(cx);
continue;
Expand Down
Loading