mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
View File

@ -433,7 +433,7 @@ namespace System.Drawing.Printing
return null;
}
return new PrinterResolution (x_resolution, y_resolution, PrinterResolutionKind.Custom);
return new PrinterResolution (PrinterResolutionKind.Custom, x_resolution, y_resolution);
}
/// <summary>
@ -452,7 +452,7 @@ namespace System.Drawing.Printing
PPD_SIZE size;
PaperSize ps;
PaperSize defsize = new PaperSize ("A4", 827, 1169, GetPaperKind (827, 1169), true);
PaperSize defsize = new PaperSize (GetPaperKind (827, 1169), "A4", 827, 1169);
ppd = (PPD_FILE) Marshal.PtrToStructure (ppd_handle, typeof (PPD_FILE));
ptr = ppd.sizes;
float w, h;
@ -462,8 +462,8 @@ namespace System.Drawing.Printing
w = size.width * 100 / 72;
h = size.length * 100 / 72;
PaperKind kind = GetPaperKind ((int) w, (int) h);
ps = new PaperSize (real_name, (int) w, (int) h, kind, def_size == kind.ToString ());
ps.SetKind (kind);
ps = new PaperSize (kind, real_name, (int) w, (int) h);
ps.RawKind = (int)kind;
if (def_size == ps.Kind.ToString ())
defsize = ps;
settings.paper_sizes.Add (ps);
@ -507,7 +507,7 @@ namespace System.Drawing.Printing
kind = PaperSourceKind.Custom;
break;
}
settings.paper_sources.Add (new PaperSource (paper_sources[source], kind, def_source == source));
settings.paper_sources.Add (new PaperSource (kind, paper_sources[source]));
if (def_source == source)
defsource = settings.paper_sources[settings.paper_sources.Count-1];
}