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

fix: Thumbails have correct aspect ratio and reload if loaded while b… #630

Merged
merged 12 commits into from
Jan 31, 2025
Merged

fix: Thumbails have correct aspect ratio and reload if loaded while b… #630

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
61cbce7
fix: Thumbails have correct aspect ratio and reload if loaded while b…
woelper Jan 29, 2025
b08d3b7
Merge branch 'master' into fix_thumbs
woelper Jan 29, 2025
5cacd46
Fix spacing on hamburger menu icons
Stoppedpuma Jan 29, 2025
a7222be
Extend thumbnail directory button name
Stoppedpuma Jan 29, 2025
5b4eb03
Revert top_bar hamburger menu changes
Stoppedpuma Jan 29, 2025
10d5565
Fix capitalisation oversight
Stoppedpuma Jan 29, 2025
4964c5e
Adjust styled_button
Stoppedpuma Jan 29, 2025
1a67f51
Merge branch 'master' into fix_thumbs
woelper Jan 30, 2025
781d70b
clean up thumbnail rendering (closes #633)
woelper Jan 30, 2025
0bb128b
fix freeze on non-mac systems when opening thumb dir
woelper Jan 30, 2025
5e56608
fix rounding
woelper Jan 30, 2025
925b1d6
reduce hover highlight color, break out thumbnail code
woelper Jan 31, 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
14 changes: 7 additions & 7 deletions src/ui/top_bar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,12 @@ pub fn draw_hamburger_menu(ui: &mut Ui, state: &mut OculanteState, app: &mut App
ui.style_mut().override_text_style = Some(egui::TextStyle::Heading);

ui.menu_button(RichText::new(LIST).size(ICON_SIZE), |ui| {
if ui.styled_button(format!("{MOVE} Reset view")).clicked() {
if ui.styled_button(format!("{MOVE} Reset view")).clicked() {
state.reset_image = true;
ui.close_menu();
}

if ui.styled_button(format!("{FRAME} View 1:1")).clicked() {
if ui.styled_button(format!("{FRAME} View 1:1")).clicked() {
set_zoom(
1.0,
Some(nalgebra::Vector2::new(
Expand All @@ -331,7 +331,7 @@ pub fn draw_hamburger_menu(ui: &mut Ui, state: &mut OculanteState, app: &mut App
let copy_pressed = key_pressed(app, state, Copy);
if let Some(img) = &state.current_image {
if ui
.styled_button(format!("{COPY} Copy"))
.styled_button(format!("{COPY} Copy"))
.on_hover_text("Copy image to clipboard")
.clicked()
|| copy_pressed
Expand All @@ -342,7 +342,7 @@ pub fn draw_hamburger_menu(ui: &mut Ui, state: &mut OculanteState, app: &mut App
}

if ui
.styled_button(format!("{CLIPBOARD} Paste"))
.styled_button(format!("{CLIPBOARD} Paste"))
.on_hover_text("Paste image from clipboard")
.clicked()
|| key_pressed(app, state, Paste)
Expand All @@ -364,16 +364,16 @@ pub fn draw_hamburger_menu(ui: &mut Ui, state: &mut OculanteState, app: &mut App
ui.close_menu();
}

if ui.styled_button(format!("{GEAR} Preferences")).clicked() {
if ui.styled_button(format!("{GEAR} Preferences")).clicked() {
state.settings_enabled = !state.settings_enabled;
ui.close_menu();
}

if ui.styled_button(format!("{EXIT} Quit")).clicked() {
if ui.styled_button(format!("{EXIT} Quit")).clicked() {
app.backend.exit();
}

ui.styled_menu_button(format!("{CLOCK} Recent"), |ui| {
ui.styled_menu_button(format!("{CLOCK} Recent"), |ui| {
let r = ui.max_rect();

let recent_rect = Rect::from_two_pos(
Expand Down
Loading