Skip to content

Sync main into AutoDrive continuity branch #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimGamerJen merged 4 commits into from
Aug 12, 2026
Merged

Sync main into AutoDrive continuity branch #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d62db2
Fix appearance binding GUI atlas rendering
SimGamerJen Aug 11, 2026
7eac0ab
Fix roster manager GUI atlas rendering
SimGamerJen Aug 11, 2026
ee3e5fa
Harden management GUI profiles against atlas bleed
SimGamerJen Aug 11, 2026
f4a47b9
Merge management UI texture fixes
SimGamerJen Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions gui/HP_AppearanceBindingsScreen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
</BoxLayout>
<ThreePartBitmap profile="fs25_lineSeparatorTopHighlighted" position="45px -119px" size="1105px 2px" />

<Bitmap profile="hpHeaderBox" id="helperHeaderBox" position="45px -135px" size="300px 50px">
<GuiElement id="helperHeaderBox" position="45px -135px" size="300px 50px">
<Text profile="hpHeaderLeft" position="10px 0px" size="250px 40.77px" text="$l10n_hp_header_helper_binding_state" />
<ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
</Bitmap>
</GuiElement>

<SmoothList profile="hpList" id="helperTable" position="50px -190px" size="290px 270px" focusInit="onOpen" focusChangeTop="nil" focusChangeBottom="nil">
<ListItem profile="hpListItem" name="helperRowTemplate" size="290px 40.77px">
Expand All @@ -34,10 +33,9 @@
<Slider profile="fs25_listSlider" size="6px 262px" dataElementId="helperTable" id="helperSlider" />
</ThreePartBitmap>

<Bitmap profile="hpHeaderBox" id="categoryHeaderBox" position="385px -135px" size="265px 50px">
<GuiElement id="categoryHeaderBox" position="385px -135px" size="265px 50px">
<Text profile="hpHeaderLeft" position="10px 0px" size="235px 40.77px" text="$l10n_hp_header_category" />
<ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
</Bitmap>
</GuiElement>

<SmoothList profile="hpList" id="categoryTable" position="390px -190px" size="255px 270px" focusChangeTop="nil" focusChangeBottom="nil">
<ListItem profile="hpListItem" name="categoryRowTemplate" size="255px 40.77px">
Expand All @@ -49,11 +47,10 @@
<Slider profile="fs25_listSlider" size="6px 262px" dataElementId="categoryTable" id="categorySlider" />
</ThreePartBitmap>

<Bitmap profile="hpHeaderBox" id="presetHeaderBox" position="695px -135px" size="455px 50px">
<GuiElement id="presetHeaderBox" position="695px -135px" size="455px 50px">
<Text profile="hpHeaderLeft" position="10px 0px" size="265px 40.77px" text="$l10n_hp_header_appearance" />
<Text profile="hpHeaderRight" position="285px 0px" size="155px 40.77px" text="$l10n_hp_header_preset_id" />
<ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
</Bitmap>
</GuiElement>

<SmoothList profile="hpList" id="presetTable" handleFocus="true" selectedWithoutFocus="false" position="700px -190px" size="445px 270px" focusChangeTop="nil" focusChangeBottom="nil">
<ListItem profile="hpListItem" name="presetRowTemplate" size="445px 40.77px">
Expand All @@ -66,11 +63,10 @@
<Slider profile="fs25_listSlider" size="6px 262px" dataElementId="presetTable" id="presetSlider" />
</ThreePartBitmap>

<Bitmap profile="hpDetailBox" id="detailBox" position="45px -470px" size="1105px 145px">
<GuiElement id="detailBox" position="45px -470px" size="1105px 145px">
<Text profile="hpMetaText" id="detailText" position="10px 8px" size="1085px 35px" text="$l10n_hp_detail_select" textLayoutMode="scrolling" />
<Text profile="hpMetaText" id="statusText" position="10px -38px" size="1085px 35px" text="$l10n_hp_status_ready" textLayoutMode="scrolling" />
<ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
</Bitmap>
</GuiElement>

</GuiElement>

Expand Down
10 changes: 4 additions & 6 deletions gui/HP_RosterManagerScreen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
</BoxLayout>
<ThreePartBitmap profile="fs25_lineSeparatorTopHighlighted" position="45px -119px" size="1105px 2px" />

<Bitmap profile="hpHeaderBox" id="rosterHeaderBox" position="45px -135px" size="1105px 50px">
<GuiElement id="rosterHeaderBox" position="45px -135px" size="1105px 50px">
<Text profile="hpHeaderLeft" position="10px 0px" size="55px 40.77px" text="$l10n_hp_roster_header_slot" />
<Text profile="hpHeaderLeft" position="75px 0px" size="210px 40.77px" text="$l10n_hp_roster_header_worker" />
<Text profile="hpHeaderLeft" position="295px 0px" size="270px 40.77px" text="$l10n_hp_roster_header_appearance" />
<Text profile="hpHeaderLeft" position="575px 0px" size="170px 40.77px" text="$l10n_hp_roster_header_role" />
<Text profile="hpHeaderLeft" position="755px 0px" size="140px 40.77px" text="$l10n_hp_roster_header_work_state" />
<Text profile="hpHeaderLeft" position="905px 0px" size="185px 40.77px" text="$l10n_hp_roster_header_roster" />
<ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
</Bitmap>
</GuiElement>

<SmoothList profile="hpList" id="rosterTable" position="50px -190px" size="1095px 345px" focusInit="onOpen" focusChangeTop="nil" focusChangeBottom="nil">
<ListItem profile="hpListItem" name="rosterRowTemplate" size="1095px 40.77px">
Expand All @@ -44,11 +43,10 @@
<Slider profile="fs25_listSlider" size="6px 337px" dataElementId="rosterTable" id="rosterSlider" />
</ThreePartBitmap>

<Bitmap profile="hpDetailBox" id="detailBox" position="45px -545px" size="1105px 110px">
<GuiElement id="detailBox" position="45px -545px" size="1105px 110px">
<Text profile="hpMetaText" id="detailText" position="10px 8px" size="1085px 35px" text="$l10n_hp_roster_detail" textLayoutMode="scrolling" />
<Text profile="hpMetaText" id="statusText" position="10px -38px" size="1085px 35px" text="$l10n_hp_status_ready" textLayoutMode="scrolling" />
<ThreePartBitmap profile="fs25_lineSeparatorBottom" position="0px 2px" />
</Bitmap>
</GuiElement>
</GuiElement>

<BoxLayout profile="fs25_dialogButtonBox" size="1170px 60px">
Expand Down
3 changes: 3 additions & 0 deletions gui/guiProfiles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@

<Profile name="hpList" extends="emptyPanel" with="anchorStretchingYLeft pivotTopLeft" />

<!-- Retained for compatibility. Management screens now use plain GuiElement containers for these regions. -->
<Profile name="hpHeaderBox" extends="emptyPanel" with="anchorStretchingYLeft pivotTopLeft">
<imageSliceId value="gui.empty" />
<imageColor value="$preset_hpColorListHeaderBackground"/>
</Profile>

<Profile name="hpDetailBox" extends="emptyPanel" with="anchorStretchingYLeft pivotTopLeft">
<imageSliceId value="gui.empty" />
<imageColor value="0 0 0 0.45"/>
</Profile>

Expand Down