first pass of merging in warp (doesn't build)

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+3 -3
View File
@@ -6,11 +6,11 @@
use std::ops::Deref;
use galaxyui::SingletonEntity;
use galaxyui_core::SingletonEntity;
use galaxyui_extras::user_preferences::UserPreferences;
use settings::PrivatePreferences;
/// An extension trait on [`galaxyui::AppContext`] for accessing private user
/// An extension trait on [`galaxyui_core::AppContext`] for accessing private user
/// preferences.
///
/// Private settings are always stored in the platform-native store (e.g.
@@ -24,7 +24,7 @@ pub trait GetUserPreferences {
fn private_user_preferences(&self) -> &dyn UserPreferences;
}
impl GetUserPreferences for galaxyui::AppContext {
impl GetUserPreferences for galaxyui_core::AppContext {
fn private_user_preferences(&self) -> &dyn UserPreferences {
<PrivatePreferences as SingletonEntity>::as_ref(self).deref()
}