administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix https://bugzilla.altlinux.org/43948

Browse source 
//if (Environment.OSVersion.Version.Major >= 6) SetProcessDPIAware();
закомментировал = в Линукс версии это бессмысленно
This commit is contained in:
Mikhalkovich Stanislav 2022-12-06 15:33:07 +03:00
parent 076673f1c1
commit 423c02e7ab
9 changed files with 77 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "8";
public const string Build = "3";
public const string Revision = "3206";
public const string Revision = "3211";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=3
%REVISION%=3206
%MINOR%=8
%REVISION%=3211
%COREVERSION%=3
%MAJOR%=3

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.8.3.3206
3.8.3.3211

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.8.3.3206'
!define VERSION '3.8.3.3211'

10
VisualPascalABCNETLinux/Form1.Designer.cs generated
View file

@ -301,6 +301,10 @@ namespace VisualPascalABC
this.menuStrip1.Size = new System.Drawing.Size(876, 24);
this.menuStrip1.TabIndex = 3;
this.menuStrip1.Text = "menuStrip1";
this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate);
this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate);
this.menuStrip1.Enter += new System.EventHandler(this.menuStrip1_Enter);
this.menuStrip1.Leave += new System.EventHandler(this.menuStrip1_Leave);
//
// mrFile
//
@ -1334,7 +1338,7 @@ namespace VisualPascalABC
// toolStripMenuItem5
//
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 22);
this.toolStripMenuItem5.Size = new System.Drawing.Size(179, 22);
this.toolStripMenuItem5.Text = "M_OPENTUTORIAL";
this.toolStripMenuItem5.Visible = false;
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
@ -1895,8 +1899,10 @@ namespace VisualPascalABC
this.cmHelp,
this.cmSamples});
this.cmEditor.Name = "cmEditor";
this.cmEditor.Size = new System.Drawing.Size(222, 336);
this.cmEditor.Size = new System.Drawing.Size(222, 358);
this.cmEditor.Closed += new System.Windows.Forms.ToolStripDropDownClosedEventHandler(this.cmEditor_Closed);
this.cmEditor.Opening += new System.ComponentModel.CancelEventHandler(this.cmEditor_Opening);
this.cmEditor.Opened += new System.EventHandler(this.cmEditor_Opened);
//
// cmGotoDefinition
//

38
VisualPascalABCNETLinux/Form1.cs
View file

@ -2009,6 +2009,44 @@ namespace VisualPascalABC
BottomDockPanel.Size = new Size(BPanel.Width-3, BPanel.Height - 3);
}
public bool MenuActive { get; set; } = false;
private void menuStrip1_MenuActivate(object sender, EventArgs e)
{
MenuActive = true;
//Text = "MenuActive = " + MenuActive.ToString();
}
private void menuStrip1_MenuDeactivate(object sender, EventArgs e)
{
MenuActive = false;
//Text = "MenuActive = " + MenuActive.ToString();
}
private void menuStrip1_Enter(object sender, EventArgs e)
{
MenuActive = true;
//Text = "MenuActive = " + MenuActive.ToString();
}
private void menuStrip1_Leave(object sender, EventArgs e)
{
MenuActive = false;
//Text = "MenuActive = " + MenuActive.ToString();
}
private void cmEditor_Opened(object sender, EventArgs e)
{
MenuActive = true;
//Text = "ContextMenuActive = " + MenuActive.ToString();
}
private void cmEditor_Closed(object sender, ToolStripDropDownClosedEventArgs e)
{
MenuActive = false;
//Text = "ContextMenuActive = " + MenuActive.ToString();
}
private void tsHelp_Click(object sender, EventArgs e)
{
__showhelpinqueue();

32
VisualPascalABCNETLinux/Form1.resx
View file

@ -913,21 +913,6 @@
3UYQBqqGs0HYJ74C1YBpS/aAJZA1IWN0A9yiSlANmLRgJ1gC3QCQRnQMEncMywcykUDvnG1YDYBhmEYY
tg3MQTWgc8ZmuCTM/8iGoRtg6ZeJakDr1A3gdIALoOcFU+9UVAMaJ679n1za8z8mv/1/GDCOA4HRBApp
d2BgOYXmg51s6Zvx3wyoEYSNPZJRDSAPMDAAAHcqa1Aumt/OAAAAAElFTkSuQmCC
</value>
</data>
<data name="tstaSelect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="tsatConsoleApplication.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -960,6 +945,21 @@
saeS2rb7UOgXaTuVTHazh+J2K72OKDpTHEBh1SiuGV8sLLYtFmb8JHwex090zigDU8LZCb1Pl+WA/KsG
Jj3zsvDoBzC8JxbusgseC5B9pmAzIK+sn7b772judaPudtCktaO5bRO+rJXG1hc0aJ5T12iipnaIGtUw
5y4qNgNEqeo7yM0rl+jiFeNZnIk7fyOCEhJ+AymIZtFIMC8OAAAAAElFTkSuQmCC
</value>
</data>
<data name="tstaSelect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton16.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -1025,7 +1025,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK
FQAAAk1TRnQBSQFMAgEBEAEAARQBAwEUAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
FQAAAk1TRnQBSQFMAgEBEAEAAUQBAwFEAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAVADAAEBAQABCAYAARQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

10
VisualPascalABCNETLinux/IB/CodeCompletion/TooltipServiceManager.cs
View file

@ -93,11 +93,15 @@ namespace VisualPascalABC
public static void ToolTipService_TextAreaKeyDown(object sender, KeyEventArgs e)
{
VisualPABCSingleton.MainForm.MenuActive = false;
//VisualPABCSingleton.MainForm.Text = "MenuActive = " + false.ToString();
hideToolTip();
}
public static void ToolTipService_TextAreaMouseEvent_HideToolTip(object sender, MouseEventArgs e)
{
VisualPABCSingleton.MainForm.MenuActive = false;
//VisualPABCSingleton.MainForm.Text = "MenuActive = " + false.ToString();
hideToolTip();
}
@ -148,7 +152,11 @@ namespace VisualPascalABC
p.Y += 5;
string txt = GetPopupHintText(textArea, e);
dvw.Location = choose_location(p, txt);
dvw.Description = txt;
if (!VisualPABCSingleton.MainForm.MenuActive)
{
dvw.ShowInTaskbar = false;
dvw.Description = txt;
}
_hint_hide_d = dvw.Font.Height / 2;
_mouse_hint_x = e.MousePosition.X;
_mouse_hint_y = e.MousePosition.Y;

2
VisualPascalABCNETLinux/Program.cs
View file

@ -98,7 +98,7 @@ namespace VisualPascalABC
try
{
if (Environment.OSVersion.Version.Major >= 6) SetProcessDPIAware();
//if (Environment.OSVersion.Version.Major >= 6) SetProcessDPIAware();
CommandLineArgs = args;
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);