eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00
Code Issues 123 Wiki Activity

Merge pull request #65 from jakubg1/second

Browse Source 
Fixes for timetable window width and tiny launcher adjustments
This commit is contained in:
Ryba04
2024-08-25 14:55:21 +02:00
committed by GitHub
parent 663ab0821c 27efcdccfa
commit 7306c79e69
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
driveruipanels.cpp
View File

@@ -485,11 +485,13 @@ timetable_panel::render() {
| ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoCollapse
| ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 );
// HACK: Make sure the timetable window is of correct width when using a larger font size.
float horizontalScale = Global.ui_fontsize / 13;
if( size.x > 0 ) { if( size.x > 0 ) {
ImGui::SetNextWindowSize( ImVec2S( size.x, size.y ) ); ImGui::SetNextWindowSize( ImVec2S( size.x * horizontalScale, size.y ) );
} }
if( size_min.x > 0 ) { if( size_min.x > 0 ) {
ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x, size_min.y ), ImVec2S( size_max.x, size_max.y ) ); ImGui::SetNextWindowSizeConstraints( ImVec2S( size_min.x * horizontalScale, size_min.y ), ImVec2S( size_max.x * horizontalScale, size_max.y ) );
} }
auto const panelname { ( auto const panelname { (
title.empty() ? title.empty() ?

1
keyboardinput.cpp
View File

@@ -173,7 +173,6 @@ keyboard_input::recall_bindings() {
// This can't be done now as by default this would destroy all command descriptions, // This can't be done now as by default this would destroy all command descriptions,
// which are used by Starter. // which are used by Starter.
// Do this when szczawik's Starter becomes deprecated or implements command descriptions in some other way. // Do this when szczawik's Starter becomes deprecated or implements command descriptions in some other way.
WriteLog("got: \"" + bindingkeyname + "\"");
if (descriptionStarted) { if (descriptionStarted) {
if (description.size() > 0) { if (description.size() > 0) {
description += " "; description += " ";

2
launcher/vehicle_picker.h
View File

@@ -19,7 +19,7 @@ private:
std::shared_ptr<const vehicle_desc> selected_vehicle; std::shared_ptr<const vehicle_desc> selected_vehicle;
const std::string *selected_group = nullptr; const std::string *selected_group = nullptr;
const skin_set *selected_skinset = nullptr; const skin_set *selected_skinset = nullptr;
bool display_by_groups = false; bool display_by_groups = true;
deferred_image placeholder_mini; deferred_image placeholder_mini;
std::array<char, 128> search_query = { 0 }; std::array<char, 128> search_query = { 0 };