Merge remote-tracking branch 'upstream/master'

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Gui.cs

@@ -460,30 +460,29 @@ namespace CM3D2.MultipleMaids.Plugin
                 position1 = new Rect(GetPix(7),
                                       GetPix(138),
                                       GetPix(44) * 4 + GetPix(20),
-                                     rectWin.height * 0.785f);
+                                      rectWin.height - GetPix(148));
                 viewRect = new Rect(0.0f,
                                     0.0f,
                                     position1.width * 0.845f,
-                                    pix * (float)Math.Ceiling(sortList.Count / 4.0) + GetPix(5));
+                                    Mathf.Ceil(sortList.Count / 4 + 1) * pix + GetPix(10));
             }
             else
             {
                 position1 = new Rect(GetPix(7),
                                       GetPix(138),
                                       GetPix(44) * 4 + GetPix(20),
-                                     (float)(rectWin.height * 0.785000026226044 * 0.959999978542328));
+                                      rectWin.height - GetPix(148));
                 viewRect = new Rect(0.0f,
                                     0.0f,
                                     position1.width * 0.845f,
-                                    (float)(pix * Math.Ceiling(sortList.Count / 4.0)
-                                             + GetPix(5) * 0.920000016689301));
+                                    Mathf.Ceil(sortList.Count / 4 + 1) * pix + GetPix(10));
             }
 
             scrollPos = GUI.BeginScrollView(position1, scrollPos, viewRect);
             for (int index = 0; index < sortList.Count; ++index)
             {
-                Rect position2 = new Rect(GetPix(index % 4 * 45),
-                                           GetPix(index / 4 * 45),
+                Rect position2 = new Rect(index % 4 * GetPix(45),
+                                           index / 4 * GetPix(45),
                                            GetPix(44),
                                            GetPix(44));
                 if (GUI.Button(position2, sortList[index].tex))