Add basic IME support and fix some font setup

drey7925 · Jun 27, 2024 · f11023c · f11023c
1 parent c94d32e
commit f11023c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/perovskite_client/src/game_state/mod.rs b/perovskite_client/src/game_state/mod.rs
@@ -701,11 +701,13 @@ impl ClientState {
     }
 
     pub(crate) fn next_frame(&self, aspect_ratio: f64) -> FrameState {
+        let mut egui_wants_events = false;
         {
             self.timekeeper.update_frame();
 
             let mut input = self.input.lock();
-            input.set_modal_active(self.egui.lock().wants_user_events());
+            egui_wants_events = self.egui.lock().wants_user_events();
+            input.set_modal_active(egui_wants_events);
             if input.take_just_pressed(BoundAction::Inventory) {
                 self.egui.lock().open_inventory();
             } else if input.take_just_pressed(BoundAction::Menu) {
@@ -771,6 +773,7 @@ impl ClientState {
             },
             player_position,
             tool_state,
+            ime_enabled: egui_wants_events,
         }
     }
 
@@ -838,6 +841,7 @@ pub(crate) struct FrameState {
     pub(crate) scene_state: SceneState,
     pub(crate) player_position: Vector3<f64>,
     pub(crate) tool_state: ToolState,
+    pub(crate) ime_enabled: bool,
 }
 
 use perovskite_core::protocol::blocks::{self as blocks_proto, CubeVariantEffect};

diff --git a/perovskite_client/src/game_ui/egui_ui.rs b/perovskite_client/src/game_ui/egui_ui.rs
@@ -703,7 +703,8 @@ impl EguiUi {
                         TextEdit::singleline(&mut self.chat_message_input)
                             .hint_text("Type a message; press Enter to send or Escape to close.")
                             .lock_focus(true)
-                            .desired_width(f32::INFINITY),
+                            .desired_width(f32::INFINITY)
+                            .font(egui::FontId::proportional(16.0)),
                     );
                     if self.chat_force_request_focus {
                         self.chat_force_request_focus = false;

diff --git a/perovskite_client/src/main_menu.rs b/perovskite_client/src/main_menu.rs
@@ -2,11 +2,12 @@ use std::{ops::Deref, sync::Arc};
 
 use anyhow::Context;
 use arc_swap::ArcSwap;
-use egui::{Color32, Layout, ProgressBar, RichText, TextEdit};
+use egui::{Color32, FontId, Layout, ProgressBar, RichText, TextEdit};
 use tokio::sync::{oneshot, watch};
 use vulkano::{image::SampleCount, render_pass::Subpass};
 use winit::{event::WindowEvent, event_loop::EventLoop};
 
+use crate::vulkan::shaders::egui_adapter::set_up_fonts;
 use crate::{
     game_state::settings::GameSettings,
     vulkan::{
@@ -39,7 +40,7 @@ impl MainMenu {
             is_overlay: true,
             samples: SampleCount::Sample1,
         };
-        let egui_gui = egui_winit_vulkano::Gui::new_with_subpass(
+        let mut egui_gui = egui_winit_vulkano::Gui::new_with_subpass(
             event_loop,
             ctx.swapchain().surface().clone(),
             ctx.clone_queue(),
@@ -49,6 +50,12 @@ impl MainMenu {
             ctx.swapchain().image_format(),
             gui_config,
         );
+        set_up_fonts(&mut egui_gui.egui_ctx);
+        let mut style = (*egui_gui.egui_ctx.style()).clone();
+        style
+            .text_styles
+            .insert(egui::TextStyle::Body, FontId::proportional(16.0));
+        egui_gui.egui_ctx.set_style(style);
         let settings_guard = settings.load();
         MainMenu {
             egui_gui,

diff --git a/perovskite_client/src/vulkan/game_renderer.rs b/perovskite_client/src/vulkan/game_renderer.rs
@@ -31,6 +31,7 @@ use vulkano::{
     sync::{future::FenceSignalFuture, FlushError, GpuFuture},
 };
 
+use winit::window::ImePurpose;
 use winit::{
     dpi::{PhysicalPosition, PhysicalSize},
     event::{Event, WindowEvent},
@@ -85,9 +86,11 @@ impl ActiveGame {
             scene_state,
             mut player_position,
             tool_state,
+            ime_enabled,
         } = self
             .client_state
             .next_frame((window_size.width as f64) / (window_size.height as f64));
+        ctx.window.set_ime_allowed(ime_enabled);
         ctx.start_render_pass(
             &mut command_buf_builder,
             framebuffer,
@@ -543,6 +546,8 @@ impl GameRenderer {
                             command_buf_builder,
                         )
                     } else {
+                        // we're not in the active game, allow the IME
+                        self.ctx.window.set_ime_allowed(true);
                         self.ctx
                             .start_render_pass(
                                 &mut command_buf_builder,

diff --git a/perovskite_client/src/vulkan/shaders/egui_adapter.rs b/perovskite_client/src/vulkan/shaders/egui_adapter.rs
@@ -139,7 +139,7 @@ impl EguiAdapter {
     }
 }
 
-fn set_up_fonts(egui_ctx: &mut egui::Context) {
+pub(crate) fn set_up_fonts(egui_ctx: &mut egui::Context) {
     let mut fonts = egui::FontDefinitions::default();
     fonts.font_data.insert(
         "NotoSans-Light".to_owned(),

diff --git a/perovskite_server/src/network_server/auth.rs b/perovskite_server/src/network_server/auth.rs
@@ -14,7 +14,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-use std::{sync::Arc, u8};
+use std::sync::Arc;
 
 use opaque_ke::{
     CredentialFinalization, CredentialRequest, RegistrationRequest, RegistrationUpload,