mirror of
https://github.com/mikedilger/gossip.git
synced 2024-09-19 19:46:50 +00:00
fix DPI work
This commit is contained in:
parent
cdf402c6b5
commit
7dbab387e6
@ -152,8 +152,7 @@ impl Settings {
|
|||||||
('pow', ?),\
|
('pow', ?),\
|
||||||
('offline', ?),\
|
('offline', ?),\
|
||||||
('light_mode', ?),\
|
('light_mode', ?),\
|
||||||
('set_client_tag', ?),\
|
('set_client_tag', ?)",
|
||||||
('override_dpi', ?)",
|
|
||||||
)?;
|
)?;
|
||||||
stmt.execute((
|
stmt.execute((
|
||||||
self.feed_chunk,
|
self.feed_chunk,
|
||||||
@ -167,10 +166,21 @@ impl Settings {
|
|||||||
self.pow,
|
self.pow,
|
||||||
bool_to_numstr(self.offline),
|
bool_to_numstr(self.offline),
|
||||||
bool_to_numstr(self.light_mode),
|
bool_to_numstr(self.light_mode),
|
||||||
bool_to_numstr(self.set_client_tag),
|
bool_to_numstr(self.set_client_tag)
|
||||||
self.override_dpi,
|
|
||||||
))?;
|
))?;
|
||||||
|
|
||||||
|
// Save override dpi
|
||||||
|
if let Some(ref dpi) = self.override_dpi {
|
||||||
|
let mut stmt = db.prepare(
|
||||||
|
"REPLACE INTO SETTINGS (key, value) VALUES ('override_dpi', ?)",
|
||||||
|
)?;
|
||||||
|
stmt.execute((&dpi,))?;
|
||||||
|
} else {
|
||||||
|
// Otherwise delete any such setting
|
||||||
|
let mut stmt = db.prepare("DELETE FROM settings WHERE key='override_dpi'")?;
|
||||||
|
stmt.execute(())?;
|
||||||
|
}
|
||||||
|
|
||||||
// Save private key identity
|
// Save private key identity
|
||||||
if let Some(ref epk) = self.encrypted_private_key {
|
if let Some(ref epk) = self.encrypted_private_key {
|
||||||
let mut stmt = db.prepare(
|
let mut stmt = db.prepare(
|
||||||
|
@ -109,12 +109,14 @@ impl GossipUi {
|
|||||||
if let Some(dpi) = settings.override_dpi {
|
if let Some(dpi) = settings.override_dpi {
|
||||||
let ppt: f32 = dpi as f32 / 72.0;
|
let ppt: f32 = dpi as f32 / 72.0;
|
||||||
cctx.egui_ctx.set_pixels_per_point(ppt);
|
cctx.egui_ctx.set_pixels_per_point(ppt);
|
||||||
|
tracing::debug!("Pixels per point: {}", ppt);
|
||||||
} else if let Some(ppt) = cctx.integration_info.native_pixels_per_point {
|
} else if let Some(ppt) = cctx.integration_info.native_pixels_per_point {
|
||||||
cctx.egui_ctx.set_pixels_per_point(ppt);
|
cctx.egui_ctx.set_pixels_per_point(ppt);
|
||||||
|
tracing::debug!("Pixels per point: {}", ppt);
|
||||||
|
} else {
|
||||||
|
tracing::debug!("Pixels per point: {}", cctx.egui_ctx.pixels_per_point());
|
||||||
}
|
}
|
||||||
|
|
||||||
tracing::debug!("Pixels per point: {}", cctx.egui_ctx.pixels_per_point());
|
|
||||||
|
|
||||||
// Set global pixels_per_point_times_100, used for image scaling.
|
// Set global pixels_per_point_times_100, used for image scaling.
|
||||||
GLOBALS.pixels_per_point_times_100.store(
|
GLOBALS.pixels_per_point_times_100.store(
|
||||||
(cctx.egui_ctx.pixels_per_point() * 100.0) as u32,
|
(cctx.egui_ctx.pixels_per_point() * 100.0) as u32,
|
||||||
|
@ -5,7 +5,7 @@ use eframe::egui;
|
|||||||
use egui::widgets::{Button, Slider};
|
use egui::widgets::{Button, Slider};
|
||||||
use egui::{Align, Context, Layout, ScrollArea, Ui};
|
use egui::{Align, Context, Layout, ScrollArea, Ui};
|
||||||
|
|
||||||
pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Frame, ui: &mut Ui) {
|
pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Frame, ui: &mut Ui) {
|
||||||
ui.heading("Settings");
|
ui.heading("Settings");
|
||||||
|
|
||||||
ScrollArea::vertical().show(ui, |ui| {
|
ScrollArea::vertical().show(ui, |ui| {
|
||||||
@ -144,9 +144,14 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
|
|||||||
&mut app.override_dpi,
|
&mut app.override_dpi,
|
||||||
"Override to ");
|
"Override to ");
|
||||||
ui.add(Slider::new(&mut app.override_dpi_value, 72..=250).text("DPI"));
|
ui.add(Slider::new(&mut app.override_dpi_value, 72..=250).text("DPI"));
|
||||||
|
if ui.button("Do it now").clicked() {
|
||||||
|
let ppt: f32 = app.override_dpi_value as f32 / 72.0;
|
||||||
|
ctx.set_pixels_per_point(ppt);
|
||||||
|
}
|
||||||
|
|
||||||
// set real setting if changed
|
// transfer to app.settings
|
||||||
app.settings.override_dpi = if app.override_dpi {
|
app.settings.override_dpi = if app.override_dpi {
|
||||||
|
// Set it in settings to be saved on button press
|
||||||
Some(app.override_dpi_value)
|
Some(app.override_dpi_value)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
|
Loading…
Reference in New Issue
Block a user