Fixed about menu
This commit is contained in:
parent
80afacfcbd
commit
732261b58c
2 changed files with 11 additions and 5 deletions
|
|
@ -346,7 +346,7 @@ void MainProgram::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
||||||
}
|
}
|
||||||
case InputManager::KEY_FULLSCREEN: {
|
case InputManager::KEY_FULLSCREEN: {
|
||||||
if(key.down && !key.repeat)
|
if(key.down && !key.repeat)
|
||||||
drawGui = !drawGui;
|
input.toggleFullscreen = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
g.input_key_callback(key);
|
g.input_key_callback(key);
|
||||||
|
|
|
||||||
|
|
@ -1623,7 +1623,7 @@ void Toolbar::options_menu() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ABOUT_MENU: {
|
case ABOUT_MENU: {
|
||||||
center_obstructing_window_gui("about menu", CLAY_SIZING_FIT(500), CLAY_SIZING_FIT(0), [&] {
|
center_obstructing_window_gui("about menu", CLAY_SIZING_FIXED(650), CLAY_SIZING_FIXED(500), [&] {
|
||||||
about_menu_inner_gui();
|
about_menu_inner_gui();
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
@ -1681,7 +1681,7 @@ void Toolbar::general_settings_inner_gui() {
|
||||||
}) {
|
}) {
|
||||||
gui.element<ScrollArea>("general settings scroll area", ScrollArea::Options{
|
gui.element<ScrollArea>("general settings scroll area", ScrollArea::Options{
|
||||||
.scrollVertical = true,
|
.scrollVertical = true,
|
||||||
.clipHorizontal = true,
|
.clipHorizontal = false,
|
||||||
.clipVertical = true,
|
.clipVertical = true,
|
||||||
.showScrollbarY = true,
|
.showScrollbarY = true,
|
||||||
.innerContent = [&](const ScrollArea::InnerContentParameters&) {
|
.innerContent = [&](const ScrollArea::InnerContentParameters&) {
|
||||||
|
|
@ -1921,6 +1921,10 @@ void Toolbar::about_menu_inner_gui() {
|
||||||
}
|
}
|
||||||
}) {
|
}) {
|
||||||
gui.element<ScrollArea>("About Menu Selector Scroll Area", ScrollArea::Options{
|
gui.element<ScrollArea>("About Menu Selector Scroll Area", ScrollArea::Options{
|
||||||
|
.scrollVertical = true,
|
||||||
|
.clipHorizontal = false,
|
||||||
|
.clipVertical = true,
|
||||||
|
.showScrollbarY = true,
|
||||||
.innerContent = [&](const ScrollArea::InnerContentParameters&) {
|
.innerContent = [&](const ScrollArea::InnerContentParameters&) {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
|
|
@ -1931,6 +1935,7 @@ void Toolbar::about_menu_inner_gui() {
|
||||||
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
.isSelected = selectedLicense == -1,
|
.isSelected = selectedLicense == -1,
|
||||||
.wide = true,
|
.wide = true,
|
||||||
|
.centered = false,
|
||||||
.onClick = [&] { selectedLicense = -1; }
|
.onClick = [&] { selectedLicense = -1; }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -1947,6 +1952,7 @@ void Toolbar::about_menu_inner_gui() {
|
||||||
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
.isSelected = selectedLicense == i,
|
.isSelected = selectedLicense == i,
|
||||||
.wide = true,
|
.wide = true,
|
||||||
|
.centered = false,
|
||||||
.onClick = [&, i] { selectedLicense = i; }
|
.onClick = [&, i] { selectedLicense = i; }
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -1959,7 +1965,7 @@ void Toolbar::about_menu_inner_gui() {
|
||||||
|
|
||||||
gui.element<ScrollArea>("About Menu Text Scroll Area", ScrollArea::Options{
|
gui.element<ScrollArea>("About Menu Text Scroll Area", ScrollArea::Options{
|
||||||
.scrollVertical = true,
|
.scrollVertical = true,
|
||||||
.clipHorizontal = true,
|
.clipHorizontal = false,
|
||||||
.clipVertical = true,
|
.clipVertical = true,
|
||||||
.showScrollbarY = true,
|
.showScrollbarY = true,
|
||||||
.innerContent = [&](const ScrollArea::InnerContentParameters&) {
|
.innerContent = [&](const ScrollArea::InnerContentParameters&) {
|
||||||
|
|
@ -2085,7 +2091,7 @@ void Toolbar::file_picker_gui() {
|
||||||
scroll_area_many_entries(gui, "file picker entries", {
|
scroll_area_many_entries(gui, "file picker entries", {
|
||||||
.entryHeight = entryHeight,
|
.entryHeight = entryHeight,
|
||||||
.entryCount = filePicker.entries.size(),
|
.entryCount = filePicker.entries.size(),
|
||||||
.clipHorizontal = true,
|
.clipHorizontal = false,
|
||||||
.elementContent = [&] (size_t i) {
|
.elementContent = [&] (size_t i) {
|
||||||
const std::filesystem::path& entry = filePicker.entries[i];
|
const std::filesystem::path& entry = filePicker.entries[i];
|
||||||
bool selectedEntry = filePicker.currentSelectedPath == entry;
|
bool selectedEntry = filePicker.currentSelectedPath == entry;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue