github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug #1580: removed device names for capture fullscreen submenu in multi-monitor setups, which sometimes delivered inconsistent results or even garbage characters. Sticking to descriptive text like "bottom left", which is more useful anyway.

Browse source
This commit is contained in:
JKlingen 2013-12-16 20:33:14 +01:00
commit c7b6c071b4
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Greenshot/Forms/MainForm.cs
View file

@ -727,15 +727,8 @@ namespace Greenshot {
if (Screen.AllScreens.Length > 1) { if (Screen.AllScreens.Length > 1) {
ToolStripMenuItem captureScreenItem; ToolStripMenuItem captureScreenItem;
Rectangle allScreensBounds = WindowCapture.GetScreenBounds(); Rectangle allScreensBounds = WindowCapture.GetScreenBounds();
string allDeviceName = "";
foreach (Screen screen in Screen.AllScreens) { captureScreenItem = new ToolStripMenuItem(Language.GetString(LangKey.contextmenu_capturefullscreen_all));
string deviceName = screen.DeviceName;
if (allDeviceName.Length > 0) {
allDeviceName += " + ";
}
allDeviceName += deviceName.Substring(deviceName.Length - 1);
}
captureScreenItem = new ToolStripMenuItem(Language.GetString(LangKey.contextmenu_capturefullscreen_all) + " (" + allDeviceName + ")");
captureScreenItem.Click += delegate { captureScreenItem.Click += delegate {
BeginInvoke((MethodInvoker)delegate { BeginInvoke((MethodInvoker)delegate {
CaptureHelper.CaptureFullscreen(false, ScreenCaptureMode.FullScreen); CaptureHelper.CaptureFullscreen(false, ScreenCaptureMode.FullScreen);
@ -744,9 +737,7 @@ namespace Greenshot {
captureScreenMenuItem.DropDownItems.Add(captureScreenItem); captureScreenMenuItem.DropDownItems.Add(captureScreenItem);
foreach (Screen screen in Screen.AllScreens) { foreach (Screen screen in Screen.AllScreens) {
Screen screenToCapture = screen; Screen screenToCapture = screen;
string deviceName = screenToCapture.DeviceName;
string deviceAlignment = ""; string deviceAlignment = "";
deviceName = deviceName.Substring(deviceName.Length - 1);
if(screen.Bounds.Top == allScreensBounds.Top && screen.Bounds.Bottom != allScreensBounds.Bottom) { if(screen.Bounds.Top == allScreensBounds.Top && screen.Bounds.Bottom != allScreensBounds.Bottom) {
deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_top); deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_top);
} else if(screen.Bounds.Top != allScreensBounds.Top && screen.Bounds.Bottom == allScreensBounds.Bottom) { } else if(screen.Bounds.Top != allScreensBounds.Top && screen.Bounds.Bottom == allScreensBounds.Bottom) {
@ -757,8 +748,7 @@ namespace Greenshot {
} else if(screen.Bounds.Left != allScreensBounds.Left && screen.Bounds.Right == allScreensBounds.Right) { } else if(screen.Bounds.Left != allScreensBounds.Left && screen.Bounds.Right == allScreensBounds.Right) {
deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_right); deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_right);
} }
deviceName = deviceAlignment + " ("+ deviceName +")"; captureScreenItem = new ToolStripMenuItem(deviceAlignment);
captureScreenItem = new ToolStripMenuItem(deviceName);
captureScreenItem.Click += delegate { captureScreenItem.Click += delegate {
BeginInvoke((MethodInvoker)delegate { BeginInvoke((MethodInvoker)delegate {
CaptureHelper.CaptureRegion(false, screenToCapture.Bounds); CaptureHelper.CaptureRegion(false, screenToCapture.Bounds);

7
Greenshot/releases/additional_files/readme.txt.template
View file

@ -4,9 +4,16 @@ CHANGE LOG:
@GITDETAILVERSION@ Bugfix Release @GITDETAILVERSION@ Bugfix Release
Bugs resolved:
* Bug #1580: removed device names for capture fullscreen submenu in multi-monitor setups, which sometimes delivered inconsistent results or even garbage characters. Sticking to descriptive text like "bottom left", which is more useful anyway.
Features: Features:
* Feature #663: dark background for textbox input when editing bright-colored text * Feature #663: dark background for textbox input when editing bright-colored text
Languages:
* Updates for Swedish translation and help, new Swedish translations for plugins
* Improvements for German translation and help
1.1.7 build 17 Bugfix Release 1.1.7 build 17 Bugfix Release
Changes: Changes: