Skip to content

fix: restore initial dimensions and placeholder on application restart #708

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

Draft
Kasui92 wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −9
Draft

fix: restore initial dimensions and placeholder on application restart #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ use crate::protos::QueryResponseObject;
use crate::protos::generated_proto::query::{QueryResponse, query_response};
use crate::providers::setup_providers;
use crate::state::{
get_last_query, get_parameter_height, get_parameter_max_height, get_parameter_max_width,
get_last_query,
get_parameter_height, get_parameter_max_height, get_parameter_max_width,
get_parameter_min_height, get_parameter_min_width, get_parameter_width, get_placeholder,
get_provider, get_theme, has_elephant, has_theme, is_connected, is_dmenu, is_dmenu_keep_open,
is_emergency, is_input_only, is_no_hints, is_no_search, is_param_close, is_password_mode,
Expand Down Expand Up @@ -712,42 +713,42 @@ fn apply_flag_logic() {
}

if let Some(val) = get_parameter_height() {
set_initial_height(Some(w.box_wrapper.height_request()));
set_initial_height(Some(w.default_box_height));
w.box_wrapper.set_height_request(val);
}

if let Some(val) = get_parameter_width() {
set_initial_width(Some(w.box_wrapper.width_request()));
set_initial_width(Some(w.default_box_width));
w.box_wrapper.set_width_request(val);
}

if let Some(val) = get_parameter_min_width() {
set_initial_min_width(Some(w.scroll.min_content_width()));
set_initial_min_width(Some(w.default_scroll_min_width));
w.scroll.set_min_content_width(val);
}

if let Some(val) = get_parameter_min_height() {
set_initial_min_height(Some(w.scroll.min_content_height()));
set_initial_min_height(Some(w.default_scroll_min_height));
w.scroll.set_min_content_height(val);
}

if let Some(val) = get_parameter_max_width() {
set_initial_max_width(Some(w.scroll.max_content_width()));
set_initial_max_width(Some(w.default_scroll_max_width));
w.scroll.set_max_content_width(val);
}

if let Some(val) = get_parameter_max_height() {
set_initial_max_height(Some(w.scroll.max_content_height()));
set_initial_max_height(Some(w.default_scroll_max_height));
w.scroll.set_max_content_height(val);
}

if get_parameter_min_width().is_some() || get_parameter_max_width().is_some() {
set_initial_width(Some(w.box_wrapper.width_request()));
set_initial_width(Some(w.default_box_width));
w.box_wrapper.set_width_request(-1);
}

if get_parameter_min_height().is_some() || get_parameter_max_height().is_some() {
set_initial_height(Some(w.box_wrapper.height_request()));
set_initial_height(Some(w.default_box_height));
w.box_wrapper.set_height_request(-1);
}

Expand Down
19 changes: 19 additions & 0 deletions src/ui/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ pub struct WindowData {
pub content_container: gtk4::Box,
pub box_wrapper: gtk4::Box,
pub error: gtk4::Label,
pub default_box_height: i32,
pub default_box_width: i32,
pub default_scroll_max_height: i32,
pub default_scroll_min_height: i32,
pub default_scroll_max_width: i32,
pub default_scroll_min_width: i32,
}

pub fn with_window<F, R>(f: F) -> R
Expand Down Expand Up @@ -339,8 +345,21 @@ pub fn setup_theme_window(app: &Application, val: &Theme) -> Result<WindowData,
keybinds,
global_keybinds,
item_keybinds,
default_box_height: 0,
default_box_width: 0,
default_scroll_max_height: 0,
default_scroll_min_height: 0,
default_scroll_max_width: 0,
default_scroll_min_width: 0,
};

ui.default_box_height = ui.box_wrapper.height_request();
ui.default_box_width = ui.box_wrapper.width_request();
ui.default_scroll_max_height = ui.scroll.max_content_height();
ui.default_scroll_min_height = ui.scroll.min_content_height();
ui.default_scroll_max_width = ui.scroll.max_content_width();
ui.default_scroll_min_width = ui.scroll.min_content_width();

if let Some(p) = &ui.preview_container {
p.set_visible(false);
}
Expand Down