|
@@ -9165,12 +9165,13 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
GUIStyle newSaveStyle = new GUIStyle("button");
|
|
|
newSaveStyle.fontSize = GetPix(50);
|
|
|
newSaveStyle.alignment = TextAnchor.MiddleCenter;
|
|
|
- GUIStyle saveImageStyle = new GUIStyle("box");
|
|
|
+ GUIStyle saveImageStyle = new GUIStyle("label");
|
|
|
saveImageStyle.fontSize = GetPix(12);
|
|
|
saveImageStyle.alignment = TextAnchor.MiddleCenter;
|
|
|
saveImageStyle.padding = new RectOffset(0, 0, 0, 0);
|
|
|
GUIStyle saveControlStyle = new GUIStyle("button");
|
|
|
saveControlStyle.fontSize = GetPix(18);
|
|
|
+ saveControlStyle.alignment = TextAnchor.MiddleCenter;
|
|
|
|
|
|
// Window variables
|
|
|
float windowPadding = GetPix(10);
|
|
@@ -9223,9 +9224,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
|
|
|
int maxColumns = Mathf.Max(1, (int)(saveGridWidth / (imageWidth + imagePadding)));
|
|
|
float imageGridWidth = maxColumns * (imageWidth + imagePadding);
|
|
|
-
|
|
|
float imageGridX = saveGridX + (saveGridWidth / 2f - imageGridWidth / 2f) + windowPadding;
|
|
|
-
|
|
|
float imageGridOffset = (saveGridWidth - imageGridWidth) / 2f;
|
|
|
|
|
|
Rect saveGridScrollRect = new Rect(
|
|
@@ -9267,13 +9266,15 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
Texture2D saveImage = saveScenes[i]?.Item2 ?? null;
|
|
|
if (saveImage != null)
|
|
|
{
|
|
|
+ float imageX = (j % maxColumns) * imageWidth + (j % maxColumns) * imagePadding + imageGridOffset;
|
|
|
+ float imageY = (j / maxColumns) * imageHeight + (j / maxColumns + 1) * imagePadding;
|
|
|
|
|
|
- if (GUI.Button(new Rect(
|
|
|
- (j % maxColumns) * imageWidth + (j % maxColumns) * imagePadding + imageGridOffset
|
|
|
- , (j / maxColumns) * imageHeight + (j / maxColumns + 1) * imagePadding
|
|
|
+ Rect buttonRect = new Rect(
|
|
|
+ imageX
|
|
|
+ , imageY
|
|
|
, imageWidth
|
|
|
- , imageHeight)
|
|
|
- , saveImage, saveImageStyle))
|
|
|
+ , imageHeight);
|
|
|
+ if (GUI.Button(buttonRect, saveImage, saveImageStyle))
|
|
|
{
|
|
|
selectedSave = i;
|
|
|
}
|
|
@@ -9302,10 +9303,10 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
float previewY = saveManagerY;
|
|
|
|
|
|
GUI.DrawTexture(new Rect(
|
|
|
- previewX - GetPix(10)
|
|
|
- , previewY - GetPix(10)
|
|
|
- , previewWidth + GetPix(20)
|
|
|
- , previewHeight + GetPix(20))
|
|
|
+ previewX - GetPix(6)
|
|
|
+ , previewY - GetPix(6)
|
|
|
+ , previewWidth + GetPix(12)
|
|
|
+ , previewHeight + GetPix(12))
|
|
|
, frame
|
|
|
);
|
|
|
GUI.DrawTexture(new Rect(
|
|
@@ -9315,19 +9316,22 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
previewHeight
|
|
|
), previewImage);
|
|
|
|
|
|
- float saveControlX = previewX + GetPix(20);
|
|
|
- float saveControlY = saveManagerY + previewHeight + windowPaddingY;
|
|
|
-
|
|
|
int saveControlWidth = GetPix(110);
|
|
|
int saveControlHeight = GetPix(40);
|
|
|
|
|
|
+ float saveControlX = previewX + (previewWidth / 2) - (saveControlWidth / 2);
|
|
|
+ float saveControlY = saveManagerY + previewHeight + windowPaddingY;
|
|
|
+
|
|
|
+ int saveControlSpacing = GetPix(90);
|
|
|
+
|
|
|
if (GUI.Button(new Rect(
|
|
|
- saveControlX
|
|
|
+ saveControlX + saveControlSpacing
|
|
|
, saveControlY
|
|
|
, saveControlWidth
|
|
|
, saveControlHeight)
|
|
|
, "Overwrite", saveControlStyle))
|
|
|
{
|
|
|
+ saveManagerScrollPos.y = 0;
|
|
|
createSaveFlag = true;
|
|
|
overwriteFlag = true;
|
|
|
|
|
@@ -9335,14 +9339,12 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
|
}
|
|
|
|
|
|
if (GUI.Button(new Rect(
|
|
|
- previewX + previewWidth - saveControlWidth - GetPix(20)
|
|
|
+ saveControlX - saveControlSpacing
|
|
|
, saveControlY
|
|
|
, saveControlWidth
|
|
|
, saveControlHeight)
|
|
|
, "Load", saveControlStyle))
|
|
|
{
|
|
|
- // string sceneData = LoadSave(saveScenes[selectedSave].Item1.FullName);
|
|
|
- // Debug.Log(sceneData);
|
|
|
loadSaveFlag = true;
|
|
|
loadScene = 1;
|
|
|
}
|