tirbofish/dropbear · diff

9a860a3 · Thribhu K

FINALLY GOT TEXT TO RENDER YIPPEEEEEEE!!!! jarvis, run github actions Unverified

diff --git a/crates/dropbear-engine/src/lib.rs b/crates/dropbear-engine/src/lib.rs
index 35467fb..0028298 100644
--- a/crates/dropbear-engine/src/lib.rs
+++ b/crates/dropbear-engine/src/lib.rs
@@ -225,7 +225,8 @@ Hardware:
             width: initial_width,
             height: initial_height,
             present_mode: surface_caps.present_modes[0],
-            alpha_mode: surface_caps.alpha_modes[0],
+            // alpha_mode: surface_caps.alpha_modes[0],
+            alpha_mode: wgpu::CompositeAlphaMode::Auto,
             view_formats: vec![],
             desired_maximum_frame_latency: 2,
         };
diff --git a/crates/eucalyptus-core/src/ui.rs b/crates/eucalyptus-core/src/ui.rs
index 561ad2e..6a594ca 100644
--- a/crates/eucalyptus-core/src/ui.rs
+++ b/crates/eucalyptus-core/src/ui.rs
@@ -1,5 +1,6 @@
 mod button;
 mod utils;
+mod text;
 
 use std::cell::RefCell;
 use std::collections::HashMap;
@@ -7,12 +8,15 @@ use ::jni::JNIEnv;
 use ::jni::objects::JObject;
 use parking_lot::Mutex;
 use serde::{Deserialize, Serialize};
-use yakui::{Yakui};
+use yakui::{Alignment, MainAxisSize, Yakui};
+use yakui::font::Fonts;
 use dropbear_engine::utils::ResourceReference;
 use dropbear_macro::SerializableComponent;
 use dropbear_traits::SerializableComponent;
 use crate::scripting::jni::utils::{FromJObject};
 use crate::scripting::result::DropbearNativeResult;
+use crate::ui::button::ButtonParser;
+use crate::ui::text::TextParser;
 
 thread_local! {
     pub static UI_CONTEXT: RefCell<UiContext> = RefCell::new(UiContext::new());
@@ -46,16 +50,6 @@ pub struct WrapperWidget<T> {
     pub widget: T,
 }
 
-impl NativeWidget for WrapperWidget<yakui::widgets::Button> {
-    fn build(self: Box<Self>, states: &mut HashMap<i64, WidgetState>) {
-        let res = self.widget.show();
-        states.insert(self.id, WidgetState {

Large diffs are not rendered by default. Showing the first 50 of 489 lines. Show full diff