gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

rog-aura: adjustment of layouts and key sizes

Browse Source
This commit is contained in:
Luke D. Jones
2022-07-29 15:35:03 +12:00
parent 0ec1574219
commit 7abad979c8
5 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rog-control-center/src/main.rs
View File

@@ -47,7 +47,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut path = PathBuf::from(DATA_DIR);
#[cfg(feature = "mocking")]
{
board_name = "GX502".to_string();
board_name = "G513".to_string();
path.pop();
path.push("rog-aura");
path.push("data");

36
rog-control-center/src/pages/aura_page.rs
View File

@@ -1,4 +1,4 @@
use egui::{Color32, Vec2};
use egui::{Align, Color32, Vec2};
use rog_aura::keys::KeyShape;
use crate::{widgets::aura_modes_group, RogApp};
@@ -24,14 +24,20 @@ impl<'a> RogApp<'a> {
aura_modes_group(supported, states, dbus, ui);
ui.spacing_mut().item_spacing = egui::vec2(0.0, 0.0);
let mut arrows_done = false;
for row in states.keyboard_layout.rows() {
ui.horizontal(|ui| {
ui.horizontal_top(|ui| {
for key in row.row() {
// your boat
let shape = KeyShape::from(key);
let label = <&str>::from(key);
if shape.is_blank() || shape.is_spacer() {
if shape.is_arrow_cluster() {
if !arrows_done {
arrow_cluster(ui, colour);
arrows_done = true;
}
} else if shape.is_blank() || shape.is_spacer() {
blank(ui, shape);
} else if shape.is_group() {
key_group(ui, colour, shape.ux(), shape.uy()).on_hover_text(label);
@@ -93,3 +99,27 @@ fn blank(ui: &mut egui::Ui, shape: KeyShape) {
ui.spacing().interact_size.y * egui::vec2(2.0 * shape.ux(), 2.0 * shape.uy());
ui.allocate_exact_size(desired_size, egui::Sense::click());
}
/// Draws entire arrow cluster block. This is visibly different to the split-arrows.
fn arrow_cluster(ui: &mut egui::Ui, colour: Color32) {
let space = KeyShape::ArrowSpacer;
let shape = KeyShape::Arrow;
ui.horizontal_top(|ui| {
ui.with_layout(egui::Layout::top_down(Align::LEFT), |ui| {
blank(ui, space);
ui.horizontal(|ui| {
blank(ui, KeyShape::RowEndSpacer);
blank(ui, KeyShape::RowEndSpacer);
key_shape(ui, colour, shape).on_hover_text("Left");
});
});
ui.with_layout(egui::Layout::top_down(Align::LEFT), |ui| {
key_shape(ui, colour, shape).on_hover_text("Up");
key_shape(ui, colour, shape).on_hover_text("Down");
});
ui.with_layout(egui::Layout::top_down(Align::LEFT), |ui| {
blank(ui, space);
key_shape(ui, colour, shape).on_hover_text("Right");
});
});
}