Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweak keycaps

Browse Source
This commit is contained in:
galister
2026-01-08 02:40:09 +09:00
parent 2f010bb42b
commit 43ccd439ee
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wlx-overlay-s/src/assets/gui/keyboard.xml
View File

@@ -24,7 +24,7 @@
<template name="KeySpecial"> <template name="KeySpecial">
<div macro="keycap_div"> <div macro="keycap_div">
<rectangle id="${id}" macro="keycap_rect"> <rectangle id="${id}" macro="keycap_rect">
<sprite color="~color_text" width="21" height="21" src="keyboard/${text}.svg" /> <sprite color="~color_text" width="24" height="24" src="keyboard/${text}.svg" />
</rectangle> </rectangle>
</div> </div>
</template> </template>
@@ -34,7 +34,7 @@
<template name="KeyLetter"> <template name="KeyLetter">
<div macro="keycap_div"> <div macro="keycap_div">
<rectangle id="${id}" macro="keycap_rect"> <rectangle id="${id}" macro="keycap_rect">
<label text="${text}" size="16" /> <label text="${text}" size="18" />
</rectangle> </rectangle>
</div> </div>
</template> </template>
@@ -44,8 +44,8 @@
<template name="KeyLetterAltGr"> <template name="KeyLetterAltGr">
<div macro="keycap_div"> <div macro="keycap_div">
<rectangle id="${id}" macro="keycap_rect" gap="3"> <rectangle id="${id}" macro="keycap_rect" gap="3">
<label text="${text}" size="16" /> <label text="${text}" size="18" />
<label color="~color_text_translucent" text="${text_altgr}" size="16" /> <label color="~color_text_translucent" text="${text_altgr}" size="18" />
</rectangle> </rectangle>
</div> </div>
</template> </template>
@@ -55,8 +55,8 @@
<template name="KeySymbol"> <template name="KeySymbol">
<div macro="keycap_div"> <div macro="keycap_div">
<rectangle id="${id}" macro="keycap_rect" gap="3"> <rectangle id="${id}" macro="keycap_rect" gap="3">
<label color="~color_text_translucent" text="${text_shift}" size="16" /> <label color="~color_text_translucent" text="${text_shift}" size="1" />
<label text="${text}" size="16" /> <label text="${text}" size="18" />
</rectangle> </rectangle>
</div> </div>
</template> </template>
@@ -65,21 +65,31 @@
<!-- Used for number & symbol keys on layouts with AltGr. --> <!-- Used for number & symbol keys on layouts with AltGr. -->
<template name="KeySymbolAltGr"> <template name="KeySymbolAltGr">
<div macro="keycap_div"> <div macro="keycap_div">
<rectangle id="${id}" macro="keycap_rect" flex_direction="row" flex_wrap="wrap"> <rectangle id="${id}" macro="keycap_rect" flex_direction="row" flex_wrap="wrap" padding="4">
<div width="50%" height="50%" align_items="center" justify_content="center"> <div width="50%" height="50%" align_items="center" justify_content="center">
<label color="~color_text_translucent" text="${text_shift}" size="16" /> <label color="~color_text_translucent" text="${text_shift}" size="18" />
</div> </div>
<div width="50%" height="50%" align_items="center" justify_content="center" /> <div width="50%" height="50%" align_items="center" justify_content="center" />
<div width="50%" height="50%" align_items="center" justify_content="center"> <div width="50%" height="50%" align_items="center" justify_content="center">
<label text="${text}" size="16" /> <label text="${text}" size="18" />
</div> </div>
<div width="50%" height="50%" align_items="center" justify_content="center"> <div width="50%" height="50%" align_items="center" justify_content="center">
<label color="~color_text_translucent" text="${text_altgr}" size="16" /> <label color="~color_text_translucent" text="${text_altgr}" size="18" />
</div> </div>
</rectangle> </rectangle>
</div> </div>
</template> </template>
<!-- Key cap with a single text line in the middle -->
<!-- Used for keys, such as Home, PageUp, etc. -->
<template name="KeyOther">
<div macro="keycap_div">
<rectangle id="${id}" macro="keycap_rect">
<label text="${text}" size="16" />
</rectangle>
</div>
</template>
<macro name="button_style" border="2" border_color="~color_accent_translucent" color="~color_bg" round="6" <macro name="button_style" border="2" border_color="~color_accent_translucent" color="~color_bg" round="6"
align_items="center" justify_content="center" padding="6" width="60" height="60" overflow="visible"/> align_items="center" justify_content="center" padding="6" width="60" height="60" overflow="visible"/>

6
wlx-overlay-s/src/overlays/keyboard/layout.rs
View File

@@ -118,7 +118,9 @@ impl Layout {
_ => label.push(format!("{vk:?}").to_lowercase()), _ => label.push(format!("{vk:?}").to_lowercase()),
} }
} }
KeyType::Other => {} KeyType::Other => {
cap_type = KeyCapType::Other;
}
} }
} }
@@ -258,4 +260,6 @@ pub enum KeyCapType {
/// Shift symbol on top-left /// Shift symbol on top-left
/// AltGr symbol on bottom-right /// AltGr symbol on bottom-right
SymbolAltGr, SymbolAltGr,
/// Label has text in the center, e.g. Home
Other,
} }