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
+2 -15
View File
@@ -1,5 +1,5 @@
use settings::Setting as _;
use galaxyui::keymap::FixedBinding;
use galaxyui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
use crate::chip_configurator::{
@@ -7,15 +7,11 @@ use crate::chip_configurator::{
ChipConfiguratorAction, ChipConfiguratorLayout, ChipEditorModalConfig, ChipEditorMouseHandles,
ChipEditorSectionsConfig, ConfigurableItem, ControlItemRenderer,
};
use crate::report_if_error;
use crate::settings::AISettings;
use crate::workspace::header_toolbar_item::HeaderToolbarItemKind;
use crate::workspace::tab_settings::{
HeaderToolbarChipSelection, TabSettings, TabSettingsChangedEvent,
};
use crate::Appearance;
use settings::Setting as _;
use crate::{report_if_error, Appearance};
const MODAL_TITLE: &str = "Edit toolbar";
@@ -179,15 +175,6 @@ fn sync_show_hide_settings<V: View>(
.set_value(code_review_placed, ctx));
});
}
let notifications_placed = placed.contains(&&HeaderToolbarItemKind::NotificationsMailbox);
if *AISettings::as_ref(ctx).show_agent_notifications != notifications_placed {
AISettings::handle(ctx).update(ctx, |settings, ctx| {
report_if_error!(settings
.show_agent_notifications
.set_value(notifications_placed, ctx));
});
}
}
impl HeaderToolbarInlineEditor {