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

TWEAK: Layout/styling overhaul for the F1 menu #1026

Merged
merged 18 commits into from
Aug 9, 2022
Merged

TWEAK: Layout/styling overhaul for the F1 menu #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5595260
First pass of UX changes
aMannus Aug 1, 2022
c93074d
More padding/styling/layout
aMannus Aug 2, 2022
7b45e47
More styling
aMannus Aug 2, 2022
12332a7
Moar styling
aMannus Aug 2, 2022
6e3fa4a
Some more styling
aMannus Aug 2, 2022
c7a62b8
Implemented padding helpers
aMannus Aug 3, 2022
60a42df
More styling, added closing buttons to windows
aMannus Aug 3, 2022
dd64d96
Fixed merge conflict mistake
aMannus Aug 3, 2022
d354d47
Fixed new enhancements
aMannus Aug 3, 2022
4025e38
Hopefully fix jenkins errors
aMannus Aug 3, 2022
30441f2
Changed button behaviour, more styling
aMannus Aug 5, 2022
f92e4be
Merge branch 'develop-zhora' into soh-f1-menu-rework
aMannus Aug 5, 2022
fc2028e
Tiny code cleanup
aMannus Aug 5, 2022
329b6da
Change buttons from close/open to > when open
aMannus Aug 5, 2022
08d5653
Small button spacing fix
aMannus Aug 5, 2022
0f5a6e1
Merge branch 'develop-zhora' into soh-f1-menu-rework
aMannus Aug 9, 2022
5644463
Small styling changes after merge
aMannus Aug 9, 2022
c2da8bf
Small fix after merge mistake
aMannus Aug 9, 2022
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
8 changes: 6 additions & 2 deletions libultraship/libultraship/Console.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,15 @@ namespace Ship {
}

void Console::Draw() {
if (!this->opened) {
CVar_SetS32("gConsoleEnabled", 0);
return;
}

bool input_focus = false;
if (!this->opened) return;

ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
ImGui::Begin("Console", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
ImGui::Begin("Console", &this->opened, ImGuiWindowFlags_NoFocusOnAppearing);
const ImVec2 pos = ImGui::GetWindowPos();
const ImVec2 size = ImGui::GetWindowSize();
// SohImGui::ShowCursor(ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows | ImGuiHoveredFlags_RectOnly), SohImGui::Dialogues::dConsole);
Expand Down
Loading