Skip to content

Commit

Permalink
refactor: replace for loops with iterator fucntions
Browse files Browse the repository at this point in the history
  • Loading branch information
decipher3114 committed Sep 24, 2024
1 parent d229a9d commit 85bf34c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
13 changes: 6 additions & 7 deletions src/utils/capture/crop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@ impl CropWindow {
self.selection_area.initial_pos,
self.selection_area.final_pos,
) {
let mut scale_factor = 1.0;
let displays = DisplayInfo::all().unwrap();
for display in displays {
if display.is_primary {
scale_factor = display.scale_factor;
}
}
let scale_factor = DisplayInfo::all()
.unwrap()
.into_iter()
.find(|d| d.is_primary)
.unwrap()
.scale_factor;

let (initial_pos, final_pos) = evaluate_points(initial_pos, final_pos);

Expand Down
15 changes: 8 additions & 7 deletions src/utils/capture/fullscreen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ use crate::utils::capture::save_image;

pub fn get_fullscreen() -> Option<RgbaImage> {
let monitors = Monitor::all().unwrap();
let mut image = None;
for monitor in monitors {
if monitor.is_primary() {
image = Some(monitor.capture_image().unwrap());
}
}
image
let image = monitors
.into_iter()
.find(|m| m.is_primary())
.unwrap()
.capture_image()
.unwrap();

Some(image)
}

pub fn capture_fullscreen(config: &Config) {
Expand Down
15 changes: 8 additions & 7 deletions src/utils/capture/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ use crate::{entities::config::Config, utils::capture::save_image};
pub fn capture_window(config: &Config) {
let windows = Window::all().unwrap();

let active_window = active_win_pos_rs::get_active_window().unwrap();
let active_window_title = active_win_pos_rs::get_active_window().unwrap().title;

for window in windows {
if window.title() == active_window.title {
let image = window.capture_image().unwrap();
let window = windows
.into_iter()
.find(|x| x.title() == active_window_title)
.unwrap();

save_image(config, image);
}
}
let image = window.capture_image().unwrap();

save_image(config, image);
}

0 comments on commit 85bf34c

Please sign in to comment.