diff --git a/.gitignore b/.gitignore index 0ad6b0d7fb..5f76289604 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +############################################################################### +# dosbox-x +############################################################################### + +# NOTE: VS ignores from https://github.com/github/gitignore is in vs/.gitignore + +# build artifacts +bin +obj # autoconfig nonsense config.h.in @@ -15,310 +20,6 @@ depcomp install-sh missing -# User-specific files -*.swp -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# subgit -subgit -subgit/* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Typescript v1 declaration files -typings/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -############################################################################### -# dosbox-x -############################################################################### - *~ dosbox-x.app/ dosbox-x.app/* diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp index 22d7c27fb4..ad6c238232 100644 --- a/src/gui/sdl_gui.cpp +++ b/src/gui/sdl_gui.cpp @@ -691,9 +691,46 @@ class PropertyEditor : public GUI::Window, public GUI::ActionEventSource_Callbac protected: Section_prop * section; Property *prop; + + static constexpr auto RightMarginWindow = 10; // TODO find origin, fix + static constexpr auto RightMarginBool = 55; // TODO find origin, fix + static constexpr auto RightMarginText = 40; // TODO find origin, fix + + int GetHostWindowWidth() const + { + const int width = parent->getParent()->getWidth(); + + return width; + } + + void SetupUI(const bool opts, GUI::Input*& input, GUI::Button*& infoButton) + { + const auto windowWidth = GetHostWindowWidth(); + + constexpr auto optionsWidth = 42; + + const auto defaultSpacing = static_cast(GUI::CurrentTheme.DefaultSpacing); + + const auto inputWidth = 235 - (opts ? optionsWidth + defaultSpacing : 0); + + const auto optionsPos = windowWidth - optionsWidth - RightMarginText - defaultSpacing; + + const auto inputPos = opts + ? optionsPos - defaultSpacing - inputWidth + : windowWidth - RightMarginText - defaultSpacing - inputWidth; + + input = new GUI::Input(this, inputPos, 0, inputWidth, static_cast(GUI::CurrentTheme.ButtonHeight)); + + if(opts) + { + infoButton = new GUI::Button(this, optionsPos, 0, "...", optionsWidth); + infoButton->addActionHandler(this); + } + } + public: PropertyEditor(Window *parent, int x, int y, Section_prop *section, Property *prop, bool opts) : - Window(parent, x, y, 500, 25), section(section), prop(prop) { (void)opts; } + Window(parent, x, y, parent->getParent()->getWidth() - RightMarginWindow, 25), section(section), prop(prop) { (void)opts; } virtual bool prepare(std::string &buffer) = 0; @@ -732,7 +769,8 @@ class PropertyEditorBool : public PropertyEditor { PropertyEditorBool(Window *parent, int x, int y, Section_prop *section, Property *prop, bool opts) : PropertyEditor(parent, x, y, section, prop, opts) { label = new GUI::Label(this, 0, 5, prop->propname); - input = new GUI::Checkbox(this, 480, 3, ""); + constexpr auto inputWidth = 3; + input = new GUI::Checkbox(this, GetHostWindowWidth() - inputWidth - RightMarginBool, inputWidth, ""); input->setChecked(static_cast(prop->GetValue())); } @@ -854,11 +892,7 @@ class PropertyEditorString : public PropertyEditor { if (title=="4dos"&&!strcmp(prop->propname.c_str(), "rem")) input = new GUI::Input(this, 30, 0, 470); else { - input = new GUI::Input(this, 260, 0, opts?195:235); - if (opts) { - infoButton=new GUI::Button(this, 460, 0, "...", 35, 24); - infoButton->addActionHandler(this); - } + SetupUI(opts, input, infoButton); } std::string temps = prop->GetValue().ToString(); input->setText(stringify(temps)); @@ -912,11 +946,7 @@ class PropertyEditorFloat : public PropertyEditor { public: PropertyEditorFloat(Window *parent, int x, int y, Section_prop *section, Property *prop, bool opts) : PropertyEditor(parent, x, y, section, prop, opts) { - input = new GUI::Input(this, 365, 0, opts?90:130); - if (opts) { - infoButton=new GUI::Button(this, 460, 0, "...", 35, 24); - infoButton->addActionHandler(this); - } + SetupUI(opts, input, infoButton); input->setText(stringify((double)prop->GetValue())); label = new GUI::Label(this, 0, 5, prop->propname); scan_tabbing = true; @@ -969,11 +999,7 @@ class PropertyEditorHex : public PropertyEditor { public: PropertyEditorHex(Window *parent, int x, int y, Section_prop *section, Property *prop, bool opts) : PropertyEditor(parent, x, y, section, prop, opts) { - input = new GUI::Input(this, 365, 0, opts?90:130); - if (opts) { - infoButton=new GUI::Button(this, 460, 0, "...", 35, 24); - infoButton->addActionHandler(this); - } + SetupUI(opts, input, infoButton); std::string temps = prop->GetValue().ToString(); input->setText(temps.c_str()); label = new GUI::Label(this, 0, 5, prop->propname); @@ -1027,11 +1053,7 @@ class PropertyEditorInt : public PropertyEditor { public: PropertyEditorInt(Window *parent, int x, int y, Section_prop *section, Property *prop, bool opts) : PropertyEditor(parent, x, y, section, prop, opts) { - input = new GUI::Input(this, 365, 0, opts?90:130); - if (opts) { - infoButton=new GUI::Button(this, 460, 0, "...", 35, 24); - infoButton->addActionHandler(this); - } + SetupUI(opts, input, infoButton); //Maybe use ToString() of Value input->setText(stringify(static_cast(prop->GetValue()))); label = new GUI::Label(this, 0, 5, prop->propname); @@ -1405,7 +1427,7 @@ class SectionEditor : public GUI::ToplevelWindow { std::vector cfg_sname; public: SectionEditor(GUI::Screen *parent, int x, int y, Section_prop *section) : - ToplevelWindow(parent, x, y, 510, 422, ""), section(section) { + ToplevelWindow(parent, x, y, 0, 0, ""), section(section) { if (section == NULL) { LOG_MSG("BUG: SectionEditor constructor called with section == NULL\n"); return; @@ -1414,9 +1436,9 @@ class SectionEditor : public GUI::ToplevelWindow { int first_row_y = 5; int row_height = 25; - int column_width = 500; - int button_row_h = 26; - int button_row_padding_y = 5 + 5; + int column_width = 600; + int button_row_h = (int)GUI::CurrentTheme.ButtonHeight; + int button_row_padding_y = static_cast(GUI::CurrentTheme.DefaultSpacing); int num_prop = 0, k=0; while (section->Get_prop(num_prop) != NULL) { diff --git a/src/libs/gui_tk/gui_tk.h b/src/libs/gui_tk/gui_tk.h index f986350fb8..8937ee1a95 100644 --- a/src/libs/gui_tk/gui_tk.h +++ b/src/libs/gui_tk/gui_tk.h @@ -244,6 +244,7 @@ struct Theme uint32_t TitleBarText = 0xFF000000; uint32_t TitleBarInactive = 0xFFFFFFFF; uint32_t TitleBarInactiveText = 0xFF000000; + uint32_t DefaultSpacing = 3; }; // Windows 3.1 theme @@ -2356,7 +2357,7 @@ class Button : public BorderedWindow, public ActionEventSource { public: /// Create a text button. /** If a size is specified, text is centered. Otherwise, button size is adjusted for the text. */ - template Button(Window *parent, int x, int y, const T text, int w = -1, int h = -1); + template Button(Window *parent, int x, int y, const T text, int w = -1, int h = static_cast(CurrentTheme.ButtonHeight)); /// Paint button. void paint(Drawable &d) const override; diff --git a/vs/.gitignore b/vs/.gitignore new file mode 100644 index 0000000000..a797190980 --- /dev/null +++ b/vs/.gitignore @@ -0,0 +1,404 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + + +############################################################################### + +# edit and continue +enc_temp_folder \ No newline at end of file