Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into editor2

Browse source
This commit is contained in:
Antonio Scandurra 2023-11-03 14:47:49 +01:00
commit 097171b9b8
37 changed files with 2910 additions and 1842 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/workspace2/src/pane.rs
View file

@ -8,7 +8,7 @@ use crate::{
};
use anyhow::Result;
use collections::{HashMap, HashSet, VecDeque};
use gpui2::{
use gpui::{
AppContext, AsyncWindowContext, Component, Div, EntityId, EventEmitter, FocusHandle, Model,
PromptLevel, Render, Task, View, ViewContext, VisualContext, WeakView, WindowContext,
};
@ -416,17 +416,17 @@ impl Pane {
}
}
// pub(crate) fn workspace(&self) -> &WeakView<Workspace> {
// &self.workspace
// }
pub(crate) fn workspace(&self) -> &WeakView<Workspace> {
&self.workspace
}
pub fn has_focus(&self, cx: &WindowContext) -> bool {
self.focus_handle.contains_focused(cx)
}
// pub fn active_item_index(&self) -> usize {
// self.active_item_index
// }
pub fn active_item_index(&self) -> usize {
self.active_item_index
}
// pub fn on_can_drop<F>(&mut self, can_drop: F)
// where
@ -2911,6 +2911,6 @@ impl Render for DraggedTab {
type Element = Div<Self>;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
div().w_8().h_4().bg(gpui2::red())
div().w_8().h_4().bg(gpui::red())
}
}