Browse Source

Fixed SD2-1013: Disposing splash screen image stream

Fixed SD2-1015: "Show Tab Order" rectangles are gone when switching between views.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1735 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
244e82fffc
  1. 5
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
  2. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ShowTabOrder/ITabOrder.cs
  3. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ShowTabOrder/TabIndexControl.cs
  4. 5
      src/Main/StartUp/Project/Dialogs/SplashScreen.cs

5
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

@ -146,6 +146,11 @@ namespace ICSharpCode.FormsDesigner
ISelectionService selectionService = (ISelectionService)designSurface.GetService(typeof(ISelectionService)); ISelectionService selectionService = (ISelectionService)designSurface.GetService(typeof(ISelectionService));
selectionService.SelectionChanged += SelectionChangedHandler; selectionService.SelectionChanged += SelectionChangedHandler;
if (IsTabOrderMode) { // fixes SD2-1015
tabOrderMode = false; // let ShowTabOrder call the designer command again
ShowTabOrder();
}
LoggingService.Info("Form Designer: END INITIALIZE"); LoggingService.Info("Form Designer: END INITIALIZE");
} }

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ShowTabOrder/ITabOrder.cs

@ -5,6 +5,7 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
/*
using System; using System;
using System.Drawing; using System.Drawing;
@ -42,3 +43,4 @@ namespace ICSharpCode.FormsDesigner
} }
} }
*/

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ShowTabOrder/TabIndexControl.cs

@ -5,6 +5,7 @@
// <version>$Revision$</version> // <version>$Revision$</version>
// </file> // </file>
/*
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing; using System.Drawing;
@ -100,3 +101,4 @@ namespace ICSharpCode.FormsDesigner
} }
} }
} }
*/

5
src/Main/StartUp/Project/Dialogs/SplashScreen.cs

@ -46,9 +46,8 @@ namespace ICSharpCode.SharpDevelop
#else #else
string versionText = VersionText; string versionText = VersionText;
#endif #endif
using (Stream stream = typeof(SplashScreenForm).Assembly.GetManifestResourceStream("Resources.SplashScreen.jpg")) { // Stream must be kept open for the lifetime of the bitmap
bitmap = new Bitmap(stream); bitmap = new Bitmap(typeof(SplashScreenForm).Assembly.GetManifestResourceStream("Resources.SplashScreen.jpg"));
}
this.ClientSize = bitmap.Size; this.ClientSize = bitmap.Size;
using (Font font = new Font("Sans Serif", 4)) { using (Font font = new Font("Sans Serif", 4)) {
using (Graphics g = Graphics.FromImage(bitmap)) { using (Graphics g = Graphics.FromImage(bitmap)) {

Loading…
Cancel
Save