-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
reziable panels #720
Merged
Merged
reziable panels #720
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
01da1f3
reziable panels
ItsSammyM 171899a
Merge branch 'main' into resizable-panels
ItsSammyM 5f82f4f
Merge branch 'main' into resizable-panels
ItsSammyM 09a72dc
Fix resizing and chat menu
Jack-Papel a336782
Merge branch 'main' into resizable-panels
Jack-Papel 9f54fd1
Fix Spectator screen
Jack-Papel aeb883f
remove spectator started screen
ItsSammyM File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,8 +7,10 @@ import ChatMenu from "../game/gameScreenContent/ChatMenu"; | |
import PlayerListMenu from "../game/gameScreenContent/PlayerListMenu"; | ||
import GraveyardMenu from "../game/gameScreenContent/GraveyardMenu"; | ||
import HeaderMenu from "../game/HeaderMenu"; | ||
import { MenuController, ContentMenu, useMenuController, MenuControllerContext } from "../game/GameScreen"; | ||
import { MenuController, ContentMenu, useMenuController, MenuControllerContext, MENU_ELEMENTS } from "../game/GameScreen"; | ||
import { MobileContext } from "../Anchor"; | ||
import { Panel, PanelGroup, PanelResizeHandle } from "react-resizable-panels"; | ||
import translate from "../../game/lang"; | ||
|
||
|
||
const DEFAULT_START_PHASE_SCREEN_TIME = 3; | ||
|
@@ -63,11 +65,20 @@ export default function SpectatorGameScreen(): ReactElement { | |
</div> | ||
{showStartedScreen | ||
? <PhaseStartedScreen/> | ||
: <div className="content"> | ||
{contentController.menuOpen(ContentMenu.ChatMenu) && <ChatMenu/>} | ||
{contentController.menuOpen(ContentMenu.PlayerListMenu) && <PlayerListMenu/>} | ||
{contentController.menuOpen(ContentMenu.GraveyardMenu) && <GraveyardMenu/>} | ||
</div>} | ||
: <PanelGroup direction="horizontal" className="content"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This code is a lil duped from gameScreen but it's chill |
||
{contentController.menusOpen().map((menu, index, menusOpen) => { | ||
const MenuElement = MENU_ELEMENTS[menu]; | ||
return <> | ||
<Panel minSize={10}> | ||
<MenuElement /> | ||
</Panel> | ||
{menusOpen.some((_, i) => i > index) && <PanelResizeHandle />} | ||
</> | ||
})} | ||
{contentController.menusOpen().length === 0 && <Panel><div className="no-content"> | ||
{translate("menu.gameScreen.noContent")} | ||
</div></Panel>} | ||
</PanelGroup>} | ||
</div> | ||
</MenuControllerContext.Provider> | ||
); | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe the enum should just be defined like this. We don't use the values part of the enum