public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
app/src/code_review/code_review_header/mod.rs
+24 -31
View File
@@ -1,36 +1,28 @@
mod header_revamp;
use crate::code_review::code_review_view::{
CodeReviewHeaderFields, CodeReviewView, CONTENT_TOP_MARGIN,
};
use crate::{
appearance::Appearance,
code_review::{
code_review_view::{get_discard_button_disabled_tooltip, CodeReviewAction, LoadedState},
diff_state::DiffStateModel,
},
menu::Menu,
ui_components::icons::Icon,
view_components::action_button::ActionButton,
};
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{Hoverable, ParentElement};
use galaxyui::platform::Cursor;
use galaxyui::ui_components::components::{Coords, UiComponent};
use galaxyui::{
elements::{
Align, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CrossAxisAlignment,
Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentOffsetBounds, Shrinkable, SizeConstraintCondition, SizeConstraintSwitch, Stack,
},
fonts::{Properties, Weight},
ui_components::{
button::{ButtonVariant, TextAndIcon, TextAndIconAlignment},
components::UiComponentStyles,
},
AppContext, Element, ModelHandle, ViewHandle,
};
use pathfinder_geometry::vector::vec2f;
use galaxy_core::features::FeatureFlag;
use galaxyui::elements::{
Align, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CrossAxisAlignment, Flex,
Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentElement, ParentOffsetBounds, Shrinkable, SizeConstraintCondition, SizeConstraintSwitch,
Stack,
};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::platform::Cursor;
use galaxyui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use galaxyui::{AppContext, Element, ModelHandle, ViewHandle};
use crate::appearance::Appearance;
use crate::code_review::code_review_view::{
get_discard_button_disabled_tooltip, CodeReviewAction, CodeReviewHeaderFields, CodeReviewView,
LoadedState, CONTENT_TOP_MARGIN,
};
use crate::code_review::diff_state::DiffStateModel;
use crate::menu::Menu;
use crate::ui_components::icons::Icon;
use crate::view_components::action_button::ActionButton;
// This is a best effort guess of the size of all of the elements in the header to know when we should start to wrap to the second row
const HEADER_WRAP_BREAKPOINT: f32 = 450.;
@@ -497,7 +489,8 @@ impl CodeReviewHeader {
}
fn get_header_text(diff_state_model: &ModelHandle<DiffStateModel>, app: &AppContext) -> String {
let branch_name = diff_state_model.read(app, |model, _| model.get_current_branch_name());
let branch_name =
diff_state_model.read(app, |model, ctx| model.get_current_branch_name(ctx));
branch_name.unwrap_or("Reviewing open changes".to_string())
}
}