Skip to content

Dev #14

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

Merged
playfairs merged 2 commits into from
Apr 24, 2026
Merged

Dev #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c69a4
ok
playfairs Apr 24, 2026
56bc0fc
Merge pull request #13 from Aster-IDE/term
playfairs Apr 24, 2026
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
1 change: 1 addition & 0 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.

6 changes: 3 additions & 3 deletions crates/command_palette/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ impl CommandPalette {
ui.label(
egui::RichText::new(">")
.size(20.0)
.color(CherryBlossomTheme::ACCENT_PINK),
.color(CherryBlossomTheme::ACCENT_PINK()),
);

let response = ui.text_edit_singleline(&mut self.query);
Expand Down Expand Up @@ -71,15 +71,15 @@ impl CommandPalette {
ui.label(
egui::RichText::new(name)
.size(14.0)
.color(CherryBlossomTheme::TEXT_PRIMARY),
.color(CherryBlossomTheme::TEXT_PRIMARY()),
);

ui.with_layout(
egui::Layout::right_to_left(egui::Align::Center),
|ui| {
ui.label(
egui::RichText::new(desc).size(12.0).color(
CherryBlossomTheme::TEXT_MUTED,
CherryBlossomTheme::TEXT_MUTED(),
),
);
},
Expand Down
113 changes: 59 additions & 54 deletions crates/editor/src/main.rs
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 22 additions & 23 deletions crates/search/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use theme::CherryBlossomTheme;

#[derive(Clone, Default, Debug)]
pub struct SearchState {
Expand Down Expand Up @@ -87,7 +86,7 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
ui.label(
egui::RichText::new("🔍")
.size(16.0)
.color(CherryBlossomTheme::TEXT_MUTED),
.color(theme::CherryBlossomTheme::TEXT_MUTED()),
);

ui.add_space(8.0);
Expand All @@ -114,9 +113,9 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
ui.add_space(10.0);

let case_color = if state.case_sensitive {
CherryBlossomTheme::ACCENT_PINK
theme::CherryBlossomTheme::ACCENT_PINK()
} else {
CherryBlossomTheme::TEXT_MUTED
theme::CherryBlossomTheme::TEXT_MUTED()
};
if ui
.add(
Expand All @@ -129,9 +128,9 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
}

let word_color = if state.whole_word {
CherryBlossomTheme::ACCENT_PINK
theme::CherryBlossomTheme::ACCENT_PINK()
} else {
CherryBlossomTheme::TEXT_MUTED
theme::CherryBlossomTheme::TEXT_MUTED()
};
if ui
.add(
Expand All @@ -144,9 +143,9 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
}

let regex_color = if state.use_regex {
CherryBlossomTheme::ACCENT_PINK
theme::CherryBlossomTheme::ACCENT_PINK()
} else {
CherryBlossomTheme::TEXT_MUTED
theme::CherryBlossomTheme::TEXT_MUTED()
};
if ui
.add(
Expand All @@ -164,7 +163,7 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
ui.label(
egui::RichText::new("↔")
.size(16.0)
.color(CherryBlossomTheme::TEXT_MUTED),
.color(theme::CherryBlossomTheme::TEXT_MUTED()),
);
ui.add_space(8.0);
ui.add_sized(
Expand All @@ -184,10 +183,10 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
egui::vec2(80.0, button_height),
egui::Button::new(
egui::RichText::new("Search")
.color(CherryBlossomTheme::BG_DARKEST)
.color(theme::CherryBlossomTheme::BG_DARKEST())
.strong(),
)
.fill(CherryBlossomTheme::ACCENT_PINK),
.fill(theme::CherryBlossomTheme::ACCENT_PINK()),
);
if search_btn.clicked() {
ui.ctx().data_mut(|d| {
Expand All @@ -214,13 +213,13 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
if !state.results.is_empty() {
ui.label(
egui::RichText::new(format!("{} matches", state.results.len()))
.color(CherryBlossomTheme::TEXT_MUTED)
.color(theme::CherryBlossomTheme::TEXT_MUTED())
.size(12.0),
);
} else if !state.query.is_empty() {
ui.label(
egui::RichText::new("No results")
.color(CherryBlossomTheme::TEXT_MUTED)
.color(theme::CherryBlossomTheme::TEXT_MUTED())
.size(12.0),
);
}
Expand All @@ -236,7 +235,7 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
ui.centered_and_justified(|ui| {
ui.label(
egui::RichText::new("Enter a search query to find across open files")
.color(CherryBlossomTheme::TEXT_MUTED)
.color(theme::CherryBlossomTheme::TEXT_MUTED())
.size(14.0),
);
});
Expand All @@ -251,7 +250,7 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
ui.label(egui::RichText::new("📄 ").size(12.0));
ui.label(
egui::RichText::new(&result.file_path)
.color(CherryBlossomTheme::ACCENT_PINK)
.color(theme::CherryBlossomTheme::ACCENT_PINK())
.size(12.0)
.strong(),
);
Expand All @@ -263,9 +262,9 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
let is_current = i == state.current_result;

let bg_color = if is_current {
CherryBlossomTheme::BG_DARK
theme::CherryBlossomTheme::BG_DARK()
} else {
CherryBlossomTheme::BG_DARKEST
theme::CherryBlossomTheme::BG_DARKEST()
};

let response = egui::Frame::new()
Expand All @@ -277,7 +276,7 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
egui::vec2(50.0, 18.0),
egui::Label::new(
egui::RichText::new(format!("{}", result.line))
.color(CherryBlossomTheme::TEXT_MUTED)
.color(theme::CherryBlossomTheme::TEXT_MUTED())
.monospace()
.size(12.0),
),
Expand All @@ -301,18 +300,18 @@ pub fn show_search_tab(ui: &mut egui::Ui, state: &mut SearchState, min_chars: us
ui.horizontal(|ui| {
ui.monospace(
egui::RichText::new(before)
.color(CherryBlossomTheme::TEXT_SECONDARY)
.color(theme::CherryBlossomTheme::TEXT_SECONDARY())
.size(12.0),
);
ui.monospace(
egui::RichText::new(matched)
.color(CherryBlossomTheme::ACCENT_HOT)
.color(theme::CherryBlossomTheme::ACCENT_HOT())
.strong()
.size(12.0),
);
ui.monospace(
egui::RichText::new(after)
.color(CherryBlossomTheme::TEXT_SECONDARY)
.color(theme::CherryBlossomTheme::TEXT_SECONDARY())
.size(12.0),
);
});
Expand Down Expand Up @@ -341,12 +340,12 @@ pub fn show_search_button(ui: &mut egui::Ui) {
ui.label(
egui::RichText::new("🔍")
.size(32.0)
.color(CherryBlossomTheme::TEXT_MUTED),
.color(theme::CherryBlossomTheme::TEXT_MUTED()),
);
ui.add_space(10.0);
ui.label(
egui::RichText::new("Click the search icon above\nor press Ctrl+Shift+F")
.color(CherryBlossomTheme::TEXT_MUTED)
.color(theme::CherryBlossomTheme::TEXT_MUTED())
.size(11.0),
);
});
Expand Down
Loading
Loading