CodeMirror/OnTopReplica
1
0
Fork 0
mirror of https://github.com/LorenzCK/OnTopReplica.git synced 2024-05-21 04:43:55 +12:00
Code Issues Projects Releases Wiki Activity

Improved region drawing on thumbnail.

Browse source 
Updated to version 2.9.3.
This commit is contained in:
Lorenz Cuno Klopfenstein 2010-05-10 01:27:07 +02:00
parent 8424f2f7fd
commit 812347fe8b
3 changed files with 57 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OnTopReplica/OnTopReplica.csproj
View file

@ -49,8 +49,8 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>2.9.2.%2a</ApplicationVersion>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>2.9.3.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
@ -224,7 +224,7 @@
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework Client Profile</ProductName>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">

4
OnTopReplica/Properties/AssemblyInfo.cs
View file

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyFileVersion("2.9.2.0")]
[assembly: AssemblyVersion("2.9.3.0")]
[assembly: AssemblyFileVersion("2.9.3.0")]

67
OnTopReplica/ThumbnailPanel.cs
View file

@ -70,9 +70,7 @@ namespace OnTopReplica {
set {
_glassMode = value;
//Set correct backcolor: black if glass is on
BackColor = (value || _fullscreenMode) ? Color.Black : SystemColors.Control;
UpdateBackColor();
UpdateRightClickLabels();
}
}
@ -85,14 +83,14 @@ namespace OnTopReplica {
}
set {
_fullscreenMode = value;
//Set correct backcolor: black if fullscreen is on
BackColor = (value || _glassMode) ? Color.Black : SystemColors.Control;
UpdateBackColor();
UpdateRightClickLabels();
}
}
/// <summary>
/// Gets or sets the region that is currently shown on the thumbnail. When set, enabled region showing.
/// </summary>
public Rectangle ShownRegion {
get {
return _regionCurrent;
@ -105,6 +103,9 @@ namespace OnTopReplica {
}
}
/// <summary>
/// Gets or sets whether the thumbnail is constrained to a region or not.
/// </summary>
public bool ShowRegion {
get {
return _regionEnabled;
@ -118,6 +119,9 @@ namespace OnTopReplica {
bool _drawMouseRegions = false;
/// <summary>
/// Gets or sets whether the thumbnail allows region drawing.
/// </summary>
public bool DrawMouseRegions {
get {
return _drawMouseRegions;
@ -235,6 +239,13 @@ namespace OnTopReplica {
return ret;
}
/// <summary>
/// Updates the background color.
/// </summary>
private void UpdateBackColor() {
BackColor = (FullscreenMode || GlassMode) ? Color.Black : SystemColors.Control;
}
/// <summary>Updates the right-click labels.</summary>
/// <remarks>If a thumbnail is shown no label will be visible. If no thumbnail is active, the correct label will be visible.</remarks>
private void UpdateRightClickLabels(){
@ -244,9 +255,6 @@ namespace OnTopReplica {
_labelNoGlass.Visible = false;
}
else {
//Update text (removed, can't draw regions behind non-transparent ThemedLabel control)
//_labelGlass.Text = _labelNoGlass.Text = (_drawMouseRegions) ? Strings.DrawRegions : Strings.RightClick;
//Update visibility
_labelGlass.Visible = _glassMode;
_labelNoGlass.Visible = !_glassMode;
@ -272,6 +280,7 @@ namespace OnTopReplica {
}
protected override void OnMouseClick(MouseEventArgs e) {
//Raise clicking event to allow click forwarding
if (!_clickThrough && e.Button == MouseButtons.Left) {
if(_thumbnail != null)
OnCloneClick(ScreenToThumbnail(e.Location), false);
@ -281,6 +290,7 @@ namespace OnTopReplica {
}
protected override void OnMouseDoubleClick(MouseEventArgs e) {
//Raise double clicking event to allow click forwarding
if (!_clickThrough && e.Button == MouseButtons.Left) {
if (_thumbnail != null)
OnCloneClick(ScreenToThumbnail(e.Location), true);
@ -290,8 +300,10 @@ namespace OnTopReplica {
}
protected override void OnMouseDown(MouseEventArgs e) {
if (_drawMouseRegions && e.Button == MouseButtons.Left) {
if (DrawMouseRegions && e.Button == MouseButtons.Left) {
//Start new region drawing
_drawingRegion = true;
_drawingSuspended = false;
_regionStartPoint = _regionLastPoint = e.Location;
this.Invalidate();
@ -302,8 +314,9 @@ namespace OnTopReplica {
protected override void OnMouseUp(MouseEventArgs e) {
if (_drawMouseRegions && e.Button == MouseButtons.Left) {
//Region completed
_drawingRegion = false;
_drawingSuspended = false;
HandleRegionDrawn(_regionStartPoint, _regionLastPoint);
this.Invalidate();
@ -313,20 +326,30 @@ namespace OnTopReplica {
}
protected override void OnMouseLeave(EventArgs e) {
_drawingRegion = false;
_drawingSuspended = true;
this.Invalidate();
base.OnMouseLeave(e);
}
protected override void OnMouseEnter(EventArgs e) {
_drawingSuspended = false;
this.Invalidate();
base.OnMouseEnter(e);
}
protected override void OnMouseMove(MouseEventArgs e) {
if (_drawingRegion && e.Button == MouseButtons.Left) {
//Continue drawing
_regionLastPoint = e.Location;
this.Invalidate();
}
else if(_drawMouseRegions && !_drawingRegion){
else if(DrawMouseRegions && !_drawingRegion){
//Keep track of region start point
_regionLastPoint = e.Location;
this.Invalidate();
@ -339,6 +362,7 @@ namespace OnTopReplica {
protected override void OnPaint(PaintEventArgs e) {
if (_drawingRegion) {
//Is currently drawing, show rectangle
int left = Math.Min(_regionStartPoint.X, _regionLastPoint.X);
int right = Math.Max(_regionStartPoint.X, _regionLastPoint.X);
int top = Math.Min(_regionStartPoint.Y, _regionLastPoint.Y);
@ -346,7 +370,8 @@ namespace OnTopReplica {
e.Graphics.DrawRectangle(penRed, left, top, right - left, bottom - top);
}
else if (_drawMouseRegions) {
else if (DrawMouseRegions && ! _drawingSuspended) {
//Show cursor coordinates
e.Graphics.DrawLine(penRed, new Point(0, _regionLastPoint.Y), new Point(ClientSize.Width, _regionLastPoint.Y));
e.Graphics.DrawLine(penRed, new Point(_regionLastPoint.X, 0), new Point(_regionLastPoint.X, ClientSize.Height));
}
@ -356,7 +381,10 @@ namespace OnTopReplica {
#endregion
//Set if currently drawing a window (first click/drag was initiated)
bool _drawingRegion = false;
//Set if drawing was suspended because the mouse left the control
bool _drawingSuspended = false;
Point _regionStartPoint;
Point _regionLastPoint;
@ -390,11 +418,20 @@ namespace OnTopReplica {
}
protected void HandleRegionDrawn(Point start, Point end) {
if (thumbnailSize.Width == 0 || thumbnailSize.Height == 0) //causes DivBy0
return;
int left = Math.Min(start.X, end.X);
int right = Math.Max(start.X, end.X);
int top = Math.Min(start.Y, end.Y);
int bottom = Math.Max(start.Y, end.Y);
//Clip to boundaries
left = Math.Max(0, left);
right = Math.Min(thumbnailSize.Width, right);
top = Math.Max(0, top);
bottom = Math.Min(thumbnailSize.Height, bottom);
//Offset points of padding space around thumbnail
left -= padWidth;
right -= padWidth;