diff --git a/dash-frontend/src/tab/settings/tab_look_and_feel.rs b/dash-frontend/src/tab/settings/tab_look_and_feel.rs index 45b9d2c7..a63f7a72 100644 --- a/dash-frontend/src/tab/settings/tab_look_and_feel.rs +++ b/dash-frontend/src/tab/settings/tab_look_and_feel.rs @@ -1,6 +1,6 @@ use crate::tab::settings::{ - macros::{options_category, options_checkbox, options_dropdown, options_slider_f32}, SettingType, SettingsMountParams, SettingsTab, + macros::{options_category, options_checkbox, options_dropdown, options_slider_f32}, }; pub struct State {} diff --git a/wayvr/src/assets/lang/de.json b/wayvr/src/assets/lang/de.json index 3cb9de89..ded01c0c 100644 --- a/wayvr/src/assets/lang/de.json +++ b/wayvr/src/assets/lang/de.json @@ -86,7 +86,8 @@ "GLOBAL": "Immer sichtbar", "ANGLE_FADE": "Winkelübergang", "ANGLE_FADE_HELP": "Ausblenden, wenn nicht auf das Headset gerichtet", - "BLOCK_INPUT": "Blockiere Spieleingabe" + "BLOCK_INPUT": "Blockiere Spieleingabe", + "RESIZE_CORNER": "Zum Ändern der Größe ziehen" }, "DISABLED": "Deaktiviert", "DEFAULT": "Standard", diff --git a/wayvr/src/assets/lang/en.json b/wayvr/src/assets/lang/en.json index 27e849e2..69119250 100644 --- a/wayvr/src/assets/lang/en.json +++ b/wayvr/src/assets/lang/en.json @@ -64,7 +64,7 @@ "POS_STATIC": "Static: Not part of any set, no recenter.", "POSITIONING": "Positioning", "RESIZE_PRESS_AND_DRAG": "Resize (press & drag)", - "RESIZE_CORNER": "Click & hold to resize", + "RESIZE_CORNER": "Drag to resize", "STEREO_3D_MODE": { "ADJUST_MOUSE": "Adjust mouse", "FULL_FRAME": "Full 3D", diff --git a/wayvr/src/assets/lang/es.json b/wayvr/src/assets/lang/es.json index 6c534842..b12dcb57 100644 --- a/wayvr/src/assets/lang/es.json +++ b/wayvr/src/assets/lang/es.json @@ -86,7 +86,8 @@ "GLOBAL": "Siempre visible", "ANGLE_FADE": "Atenuación angular", "ANGLE_FADE_HELP": "Desvanecer cuando no se mira el HMD", - "BLOCK_INPUT": "Bloquear entrada del juego" + "BLOCK_INPUT": "Bloquear entrada del juego", + "RESIZE_CORNER": "Arrastra para cambiar el tamaño" }, "DISABLED": "Deshabilitado", "DEFAULT": "Por defecto", diff --git a/wayvr/src/assets/lang/it.json b/wayvr/src/assets/lang/it.json index c0c701be..4321c9a3 100644 --- a/wayvr/src/assets/lang/it.json +++ b/wayvr/src/assets/lang/it.json @@ -74,7 +74,8 @@ "GLOBAL": "Sempre visibile", "ANGLE_FADE": "Dissolvenza angolare", "ANGLE_FADE_HELP": "Sfumatura quando non si guarda l'HMD", - "BLOCK_INPUT": "Blocca l'input del gioco" + "BLOCK_INPUT": "Blocca l'input del gioco", + "RESIZE_CORNER": "Trascina per ridimensionare" }, "GRAB": { "ADJUST_DISTANCE": "Regola la distanza", diff --git a/wayvr/src/assets/lang/ja.json b/wayvr/src/assets/lang/ja.json index 49c80315..110f0caa 100644 --- a/wayvr/src/assets/lang/ja.json +++ b/wayvr/src/assets/lang/ja.json @@ -84,7 +84,8 @@ "GLOBAL": "常に表示", "ANGLE_FADE": "角度フェード", "ANGLE_FADE_HELP": "HMDに向いていない時にフェード", - "BLOCK_INPUT": "ゲーム入力をブロック" + "BLOCK_INPUT": "ゲーム入力をブロック", + "RESIZE_CORNER": "ドラッグしてサイズ変更" }, "DISABLED": "無効", "DEFAULT": "デフォルト", @@ -125,4 +126,4 @@ "INIT_ERROR": "Whisperエンジンの起動中にエラーが発生しました", "ENTER_KEY": "Enterキー" } -} \ No newline at end of file +} diff --git a/wayvr/src/assets/lang/pl.json b/wayvr/src/assets/lang/pl.json index 9ed26b87..62cf8913 100644 --- a/wayvr/src/assets/lang/pl.json +++ b/wayvr/src/assets/lang/pl.json @@ -84,7 +84,8 @@ }, "GLOBAL": "Zawsze widoczne", "ANGLE_FADE": "Zanik kątowy", - "ANGLE_FADE_HELP": "Wyblaknij, gdy nie patrzysz na HMD" + "ANGLE_FADE_HELP": "Wyblaknij, gdy nie patrzysz na HMD", + "RESIZE_CORNER": "Przeciągnij, aby zmienić rozmiar" }, "DISABLED": "Wyłączone", "DEFAULT": "Domyślny", diff --git a/wayvr/src/assets/lang/zh_CN.json b/wayvr/src/assets/lang/zh_CN.json index 6d1e6c67..f70babe9 100644 --- a/wayvr/src/assets/lang/zh_CN.json +++ b/wayvr/src/assets/lang/zh_CN.json @@ -74,7 +74,8 @@ "GLOBAL": "始终可见", "ANGLE_FADE": "角度淡出", "ANGLE_FADE_HELP": "未朝向HMD时淡出", - "BLOCK_INPUT": "阻止游戏输入" + "BLOCK_INPUT": "阻止游戏输入", + "RESIZE_CORNER": "拖动以调整大小" }, "GRAB": { "ADJUST_DISTANCE": "调整距离", diff --git a/wgui/src/event.rs b/wgui/src/event.rs index eb0547db..a65c96a9 100644 --- a/wgui/src/event.rs +++ b/wgui/src/event.rs @@ -23,13 +23,13 @@ use crate::{ pub struct DeviceBitmask(pub u8); impl DeviceBitmask { - pub fn from_index(index: usize) -> Self { - debug_assert!(index < 8); - Self(1u8 << index) - } - pub fn to_index(self) -> Option { - (self.0 != 0).then(|| self.0.trailing_zeros() as usize) - } + pub fn from_index(index: usize) -> Self { + debug_assert!(index < 8); + Self(1u8 << index) + } + pub fn to_index(self) -> Option { + (self.0 != 0).then(|| self.0.trailing_zeros() as usize) + } } #[derive(Debug, Clone, Copy)]