cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-05 11:57:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use the previously selected page size as the default dimensions for FPageSize rather than defaulting to Letter

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2016-03-26 14:20:14 -04:00
parent 40dffffa66
commit 894331c3cf
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NAPS2.Core/WinForms/FEditProfile.cs
View File

@ -412,11 +412,9 @@ namespace NAPS2.WinForms
{
// "Custom..." selected
var form = FormFactory.Create<FPageSize>();
if (lastPageSizeItem.Type == ScanPageSize.Custom)
{
// Don't set the name, since "new" is more likely than "edit"
form.PageSizeDimens = lastPageSizeItem.CustomDimens;
}
form.PageSizeDimens = lastPageSizeItem.Type == ScanPageSize.Custom
? lastPageSizeItem.CustomDimens
: lastPageSizeItem.Type.PageDimensions();
if (form.ShowDialog() == DialogResult.OK)
{
UpdatePageSizeList();

8
NAPS2.Core/WinForms/FPageSize.cs
View File

@ -10,6 +10,8 @@ namespace NAPS2.WinForms
{
public partial class FPageSize : FormBase
{
private PageDimensions initialDimens;
public FPageSize()
{
InitializeComponent();
@ -40,9 +42,11 @@ namespace NAPS2.WinForms
.RightToForm()
.Activate();
initialDimens = PageSizeDimens ?? ScanPageSize.Letter.PageDimensions();
UpdateDropdown();
comboName.Text = PageSizeName ?? "";
UpdateDimens(PageSizeDimens ?? ScanPageSize.Letter.PageDimensions());
UpdateDimens(initialDimens);
}
private void UpdateDropdown()
@ -130,7 +134,7 @@ namespace NAPS2.WinForms
UpdateDropdown();
comboName.Text = "";
UpdateDimens(ScanPageSize.Letter.PageDimensions());
UpdateDimens(initialDimens);
}
}
}