Don't open branch/marker edit dialogs at cursor pos
resolves #3714 and #2369
This commit is contained in:
parent
75e5088eed
commit
128c8e6218
|
@ -575,11 +575,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
InitialValue = branch.UserText
|
InitialValue = branch.UserText
|
||||||
};
|
};
|
||||||
|
|
||||||
var point = Cursor.Position;
|
|
||||||
point.Offset(i.Width / -2, i.Height / -2);
|
|
||||||
i.StartPosition = FormStartPosition.Manual;
|
|
||||||
i.Location = point;
|
|
||||||
|
|
||||||
if (this.ShowDialogWithTempMute(i).IsOk())
|
if (this.ShowDialogWithTempMute(i).IsOk())
|
||||||
{
|
{
|
||||||
branch.UserText = i.PromptText;
|
branch.UserText = i.PromptText;
|
||||||
|
|
|
@ -175,11 +175,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
""
|
""
|
||||||
};
|
};
|
||||||
|
|
||||||
var point = Cursor.Position;
|
|
||||||
point.Offset(i.Width / -2, i.Height / -2);
|
|
||||||
i.StartPosition = FormStartPosition.Manual;
|
|
||||||
i.Location = point;
|
|
||||||
|
|
||||||
if (!this.ShowDialogWithTempMute(i).IsOk()) return;
|
if (!this.ShowDialogWithTempMute(i).IsOk()) return;
|
||||||
|
|
||||||
UpdateTextColumnWidth();
|
UpdateTextColumnWidth();
|
||||||
|
@ -210,7 +205,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void EditMarkerPopUp(TasMovieMarker marker, bool followCursor = false)
|
public void EditMarkerPopUp(TasMovieMarker marker)
|
||||||
{
|
{
|
||||||
var markerFrame = marker.Frame;
|
var markerFrame = marker.Frame;
|
||||||
var i = new InputPrompt
|
var i = new InputPrompt
|
||||||
|
@ -224,14 +219,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
: ""
|
: ""
|
||||||
};
|
};
|
||||||
|
|
||||||
if (followCursor)
|
|
||||||
{
|
|
||||||
var point = Cursor.Position;
|
|
||||||
point.Offset(i.Width / -2, i.Height / -2);
|
|
||||||
i.StartPosition = FormStartPosition.Manual;
|
|
||||||
i.Location = point;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!this.ShowDialogWithTempMute(i).IsOk()) return;
|
if (!this.ShowDialogWithTempMute(i).IsOk()) return;
|
||||||
|
|
||||||
marker.Message = i.PromptText;
|
marker.Message = i.PromptText;
|
||||||
|
|
|
@ -903,7 +903,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
if (existingMarker != null)
|
if (existingMarker != null)
|
||||||
{
|
{
|
||||||
MarkerControl.EditMarkerPopUp(existingMarker, true);
|
MarkerControl.EditMarkerPopUp(existingMarker);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue