Убрали баг перекрытия цссма
This commit is contained in:
parent
dd1a0d1686
commit
09e7b0806c
Binary file not shown.
|
|
@ -83,7 +83,7 @@ namespace Remontor
|
||||||
|
|
||||||
hideTabWords(barShow);
|
hideTabWords(barShow);
|
||||||
hideTabHistory(barShow);
|
hideTabHistory(barShow);
|
||||||
if(SConnector.ActionConnect != null)SConnector.ActionConnect.Resize();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ namespace Remontor.Connector
|
||||||
public int OldWidth, OldHeight;
|
public int OldWidth, OldHeight;
|
||||||
public Point OldPoint;
|
public Point OldPoint;
|
||||||
public FormWindowState OldState;
|
public FormWindowState OldState;
|
||||||
|
private int over = 0;
|
||||||
public DobleMonFull()
|
public DobleMonFull()
|
||||||
{
|
{
|
||||||
OldWidth = SConnector.FormMain.Bounds.Width;
|
OldWidth = SConnector.FormMain.Bounds.Width;
|
||||||
|
|
@ -29,6 +30,14 @@ namespace Remontor.Connector
|
||||||
}
|
}
|
||||||
public override void Resize(Process Proc, Control View)
|
public override void Resize(Process Proc, Control View)
|
||||||
{
|
{
|
||||||
|
if (over == 0)
|
||||||
|
{
|
||||||
|
over = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
over = 0;
|
||||||
|
}
|
||||||
if (Chanded) return;
|
if (Chanded) return;
|
||||||
Chanded = true;
|
Chanded = true;
|
||||||
SConnector.FormMain.WindowState = FormWindowState.Normal;
|
SConnector.FormMain.WindowState = FormWindowState.Normal;
|
||||||
|
|
@ -36,7 +45,7 @@ namespace Remontor.Connector
|
||||||
SConnector.FormMain.Width = SGlobalSetting.settingApp.WidthDoble;
|
SConnector.FormMain.Width = SGlobalSetting.settingApp.WidthDoble;
|
||||||
SConnector.FormMain.Height = SGlobalSetting.settingApp.HeightDoble;
|
SConnector.FormMain.Height = SGlobalSetting.settingApp.HeightDoble;
|
||||||
SConnector.FormMain.Location = new System.Drawing.Point(SGlobalSetting.settingApp.xPosDoble, SGlobalSetting.settingApp.yPosDoble);
|
SConnector.FormMain.Location = new System.Drawing.Point(SGlobalSetting.settingApp.xPosDoble, SGlobalSetting.settingApp.yPosDoble);
|
||||||
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height - 9, true);
|
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height - 9 + over, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override IModeMon Change(IModeMon Mode)
|
public override IModeMon Change(IModeMon Mode)
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,19 @@ namespace Remontor.Connector
|
||||||
{
|
{
|
||||||
[DllImport("user32.dll")]
|
[DllImport("user32.dll")]
|
||||||
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
|
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
|
||||||
|
private int over = 0;
|
||||||
public DobleMonOne() { }
|
public DobleMonOne() { }
|
||||||
public override void Resize(Process Proc, Control View)
|
public override void Resize(Process Proc, Control View)
|
||||||
{
|
{
|
||||||
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width * 2, View.Bounds.Height - 9, true);
|
if (over == 0)
|
||||||
|
{
|
||||||
|
over = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
over = 0;
|
||||||
|
}
|
||||||
|
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width * 2, View.Bounds.Height - 9 + over, true);
|
||||||
}
|
}
|
||||||
public override IModeMon Change(IModeMon Mode)
|
public override IModeMon Change(IModeMon Mode)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,19 @@ namespace Remontor.Connector
|
||||||
{
|
{
|
||||||
[DllImport("user32.dll")]
|
[DllImport("user32.dll")]
|
||||||
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
|
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
|
||||||
|
private int over = 0;
|
||||||
public DobleMonTwo() { }
|
public DobleMonTwo() { }
|
||||||
public override void Resize(Process Proc, Control View)
|
public override void Resize(Process Proc, Control View)
|
||||||
{
|
{
|
||||||
MoveWindow(Proc.MainWindowHandle, View.Bounds.X - View.Bounds.Width, View.Bounds.Y + 9, View.Bounds.Width * 2, View.Bounds.Height - 9, true);
|
if (over == 0)
|
||||||
|
{
|
||||||
|
over = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
over = 0;
|
||||||
|
}
|
||||||
|
MoveWindow(Proc.MainWindowHandle, View.Bounds.X - View.Bounds.Width, View.Bounds.Y + 9, View.Bounds.Width * 2, View.Bounds.Height - 9 + over, true);
|
||||||
}
|
}
|
||||||
public override IModeMon Change(IModeMon Mode)
|
public override IModeMon Change(IModeMon Mode)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,20 @@ namespace Remontor.Connector
|
||||||
{
|
{
|
||||||
[DllImport("user32.dll")]
|
[DllImport("user32.dll")]
|
||||||
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
|
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
|
||||||
|
private int over = 0;
|
||||||
|
|
||||||
public OneMon() { }
|
public OneMon() { }
|
||||||
public override void Resize(Process Proc, Control View)
|
public override void Resize(Process Proc, Control View)
|
||||||
{
|
{
|
||||||
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height - 9, true);
|
if(over == 0)
|
||||||
|
{
|
||||||
|
over = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
over = 0;
|
||||||
|
}
|
||||||
|
MoveWindow(Proc.MainWindowHandle, View.Bounds.X, View.Bounds.Y + 9, View.Bounds.Width, View.Bounds.Height - 9 + over, true);
|
||||||
}
|
}
|
||||||
public override IModeMon Change(IModeMon Mode)
|
public override IModeMon Change(IModeMon Mode)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -110,12 +110,14 @@
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
this.AutoValidate = System.Windows.Forms.AutoValidate.EnableAllowFocusChange;
|
||||||
this.ClientSize = new System.Drawing.Size(1094, 718);
|
this.ClientSize = new System.Drawing.Size(1094, 718);
|
||||||
this.Controls.Add(this.barSessionControl1);
|
this.Controls.Add(this.barSessionControl1);
|
||||||
this.Controls.Add(this.flowContainer1);
|
this.Controls.Add(this.flowContainer1);
|
||||||
this.Controls.Add(this.flowContainerWords1);
|
this.Controls.Add(this.flowContainerWords1);
|
||||||
this.Controls.Add(this.flowConteinerSetting1);
|
this.Controls.Add(this.flowConteinerSetting1);
|
||||||
this.Controls.Add(this.panel3);
|
this.Controls.Add(this.panel3);
|
||||||
|
this.DoubleBuffered = true;
|
||||||
this.Name = "Form1";
|
this.Name = "Form1";
|
||||||
this.Text = "Form1";
|
this.Text = "Form1";
|
||||||
this.Deactivate += new System.EventHandler(this.Form1_Deactivate);
|
this.Deactivate += new System.EventHandler(this.Form1_Deactivate);
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ using System.Drawing;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using static Remontor.Setting.SettingWordsControl;
|
using static Remontor.Setting.SettingWordsControl;
|
||||||
|
|
@ -63,6 +64,7 @@ namespace Remontor
|
||||||
if (!flowContainerWords1.Bounds.Contains(clickPoint))
|
if (!flowContainerWords1.Bounds.Contains(clickPoint))
|
||||||
{
|
{
|
||||||
barSessionControl1.ShowBarSet(BarShow.HideBar);
|
barSessionControl1.ShowBarSet(BarShow.HideBar);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -84,6 +86,8 @@ namespace Remontor
|
||||||
private void Form1_Deactivate(object sender, EventArgs e)
|
private void Form1_Deactivate(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
barSessionControl1.ShowBarSet(BarShow.HideBar);
|
barSessionControl1.ShowBarSet(BarShow.HideBar);
|
||||||
|
|
||||||
|
if (SConnector.ActionConnect != null) SConnector.ActionConnect.Resize();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
|
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue