Error063/STARTLINER
1
0
Fork 0
forked from akanyan/STARTLINER
Code Pull Requests Activity

fix: display rotation

Browse Source
This commit is contained in:
あかニャン
2025-03-03 20:44:00 +00:00
parent cde0752da2
commit 9669fc3905
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rust/src/display.rs
View File

@ -5,7 +5,7 @@ use anyhow::{Result, anyhow};
pub struct DisplayInfo {
primary: String,
target: String,
target_rotation: displayz::Orientation
target_settings: displayz::DisplaySettings
}
#[cfg(not(target_os = "windows"))]
@ -15,7 +15,7 @@ pub async fn prepare_display(p: &Profile) -> Result<()> {
#[cfg(target_os = "windows")]
pub async fn prepare_display(p: &Profile) -> Result<Option<DisplayInfo>> {
use displayz::{query_displays, Orientation};
use displayz::{query_displays, Orientation, Resolution};
let display_name = p.get_str("display", "default");
let rotation = p.get_int("display-rotation", 0);
@ -44,14 +44,16 @@ pub async fn prepare_display(p: &Profile) -> Result<Option<DisplayInfo>> {
let res = DisplayInfo {
primary: primary.name().to_owned(),
target: target.name().to_owned(),
target_rotation: settings.borrow().orientation
target_settings: settings.borrow().clone()
};
match rotation {
90 => settings.borrow_mut().orientation = Orientation::Portrait,
270 => settings.borrow_mut().orientation = Orientation::PortraitFlipped,
_ => ()
};
if rotation == 90 || rotation == 270 {
let rez = settings.borrow_mut().resolution;
settings.borrow_mut().orientation = if rotation == 90 { Orientation::PortraitFlipped } else { Orientation::Portrait };
if rez.height < rez.width {
settings.borrow_mut().resolution = Resolution::new(rez.height, rez.width);
}
}
display_set.apply()?;
displayz::refresh()?;
@ -63,7 +65,7 @@ pub async fn prepare_display(p: &Profile) -> Result<Option<DisplayInfo>> {
#[cfg(target_os = "windows")]
pub async fn undo_display(info: DisplayInfo) -> Result<()> {
use displayz::query_displays;
use displayz::{query_displays, Resolution};
let display_set = query_displays()?;
@ -82,7 +84,7 @@ pub async fn undo_display(info: DisplayInfo) -> Result<()> {
let settings = target.settings()
.as_ref()
.ok_or_else(|| anyhow!("Unable to query display settings"))?;
settings.borrow_mut().orientation = info.target_rotation;
settings.replace_with(|_| info.target_settings);
display_set.apply()?;
displayz::refresh()?;