Skip to content
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

Jump to bottom

convar togglebuttons and two-click styling #142

Merged
merged 2 commits into from
Aug 27, 2024
Merged

convar togglebuttons and two-click styling #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8900aef
feat: update tabmenu with new togglebutton for zoning
PeenScreeker Aug 23, 2024
6a3b981
feat: style two-click mode togglebutton
PeenScreeker Aug 14, 2024
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
1 change: 1 addition & 0 deletions images/vector-polyline.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions images/vector-two-click.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 1 addition & 6 deletions layout/hud/tab-menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,7 @@
</Panel>

<Panel class="hud-tab-menu__enable-cursor">
<Button id="ZoningOpen" class="button horizontal-align-left" onactivate="GameInterfaceAPI.ConsoleCommand('mom_zone_edit 1');$.DispatchEvent('ZoneMenu_Show');" onmouseover="UiToolkitAPI.ShowTextTooltip('ZoningOpen', '#Zoning_ShowMenu_Tooltip');" onmouseout="UiToolkitAPI.HideTextTooltip();">
<Image class="button__icon" src="file://{images}/pencil-outline.svg" textureheight="24" />
</Button>
<Button id="ZoningClose" class="button horizontal-align-left" onactivate="GameInterfaceAPI.ConsoleCommand('mom_zone_edit 0');$.DispatchEvent('ZoneMenu_Hide');" onmouseover="UiToolkitAPI.ShowTextTooltip('ZoningClose', '#Zoning_HideMenu_Tooltip');" onmouseout="UiToolkitAPI.HideTextTooltip();">
<Image class="button__icon" src="file://{images}/pencil-off-outline.svg" textureheight="24" />
</Button>
<ToggleButton id="ZoningToggle" class="button horizontal-align-left hud-tab-menu__zoning-button" convar="mom_zone_edit" />
<Label class="hud-tab-menu__enable-cursor-tip" text="#HudTabMenu_EnableCursorTip"/>
</Panel>
</Panel>
Expand Down
9 changes: 6 additions & 3 deletions layout/pages/zoning/zoning.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,12 @@
</Panel>
<Panel id="PointsSection" class="zoning__region-details">
<Panel id="RegionPoints" class="zoning__property">
<Button class="button zoning__property-button" onactivate="ZoneMenu.pickCorners();">
<Label class="button__text" text="#Zoning_EditPoints" />
</Button>
<Panel class="zoning__region-property-container">
<ToggleButton id="TwoClickMode" class="zoning__two-click-button" convar="mom_zone_two_click" onmouseover="UiToolkitAPI.ShowTextTooltip('TwoClickMode', '#Zoning_TwoClickTogle_Tooltip');" onmouseout="UiToolkitAPI.HideTextTooltip();" />
<Button class="button zoning__property-button" onactivate="ZoneMenu.pickCorners();">
<Label class="button__text" text="#Zoning_EditPoints" />
</Button>
</Panel>
</Panel>
<Panel id="PointsList" class="zoning__region-points-list">
<!-- Populated in JS -->
Expand Down
10 changes: 0 additions & 10 deletions scripts/hud/tab-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ class HudTabMenu {
endOfRunContainer: $('#EndOfRunContainer'),
/** @type {Panel} @static */
zoningContainer: $('#ZoningContainer'),
/** @type {Panel} @static */
zoningOpenButton: $('#ZoningOpen'),
/** @type {Panel} @static */
zoningCloseButton: $('#ZoningClose'),
/** @type {Image} @static */
gamemodeImage: $('#HudTabMenuGamemodeImage'),
/** @type {Panel} @static */
Expand Down Expand Up @@ -46,20 +42,14 @@ class HudTabMenu {
this.panels.tabMenu.AddClass('hud-tab-menu--offset');
this.panels.leaderboardsContainer.AddClass('hud-tab-menu__leaderboards--hidden');
this.panels.endOfRunContainer.AddClass('hud-tab-menu__endofrun--hidden');

this.panels.zoningContainer.RemoveClass('hud-tab-menu__zoning--hidden');
this.panels.zoningOpenButton.AddClass('hud-tab-menu__zoning--hidden');
this.panels.zoningCloseButton.RemoveClass('hud-tab-menu__zoning--hidden');
}

static hideZoneMenu() {
this.panels.tabMenu.RemoveClass('hud-tab-menu--offset');
this.panels.leaderboardsContainer.RemoveClass('hud-tab-menu__leaderboards--hidden');
this.panels.endOfRunContainer.AddClass('hud-tab-menu__endofrun--hidden');

this.panels.zoningContainer.AddClass('hud-tab-menu__zoning--hidden');
this.panels.zoningOpenButton.RemoveClass('hud-tab-menu__zoning--hidden');
this.panels.zoningCloseButton.AddClass('hud-tab-menu__zoning--hidden');
}

static setMapData(isOfficial) {
Expand Down
14 changes: 14 additions & 0 deletions styles/hud/tab-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,20 @@
}
}

&__zoning-button {
height: $button-height;
width: height-percentage(100%);
background-position: center;
background-repeat: no-repeat;
background-image: url('file://{images}/pencil-outline.svg');
img-shadow: $button-icon-shadow;
wash-color: $button-text-color;

&:selected {
background-image: url('file://{images}/pencil-off-outline.svg');
}
}

&__enable-cursor {
border-top: 1px solid rgba(0, 0, 0, 0.4);
width: 100%;
Expand Down
19 changes: 19 additions & 0 deletions styles/pages/zoning/zoning.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,25 @@ $medium: 28px;
}
}

&__two-click-button {
height: $button-height;
width: height-percentage(100%);
background-position: center;
background-repeat: no-repeat;
background-image: url('file://{images}/vector-polyline.svg');
wash-color: $red;
tooltip-position: top;

&:selected {
background-image: url('file://{images}/vector-two-click.svg');
wash-color: $blue;
}

&:hover {
wash-color: $white;
}
}

&__dropdown {
width: 180px;
}
Expand Down
Loading