Commit graph

78 commits

Author SHA1 Message Date
RKrom
ac08533727 Code quality fixes (NullReference checks, unused variables etc) 2014-04-26 00:34:06 +02:00
RKrom
829a35cd37 Added a new feature: Zoomer opacity, make the zoomer transparent, currently only available via the greenshot.ini 2014-02-07 17:24:50 +01:00
JKlingen
8c4eef8e2b Updated copyright notice for 2014 2014-01-08 21:30:56 +01:00
RKrom
5ffe3dfb42 Cleanup for code-analyses 2nd phase
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2483 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2013-02-13 11:45:51 +00:00
RKrom
2ce20fee08 Cleanup of some animation code
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2438 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2013-01-24 08:22:37 +00:00
JKlingen
c777878bd7 updated copyright notice for 2013
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2436 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2013-01-20 20:18:49 +00:00
RKrom
a57fa7086f Disabled compiling of unused code for the 1.1 release
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2387 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-17 11:03:23 +00:00
RKrom
57e4a8dd73 Cleanup of the AboutForm, changed the Style to a "FixedToolWindow", I find this more professional. Changed the AnimatingForm to have a flag, EnableAnimation, which is false by default and makes it possible to make the Form the base form of all GreenshotForm forms. Renamed the conf -> coreConfiguration, as this is already in the base class. Also added some comments.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2367 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-07 16:31:20 +00:00
RKrom
b7cfe23605 Extracted the refresh/animation logic to its own class, so it could be reused elsewhere. It would be even possible to extract more, but for now this is a good basis.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2366 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-07 15:53:45 +00:00
RKrom
70d6b0356b Made sure the zoomer can't be toggled outside the region mode.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2358 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-06 06:03:12 +00:00
RKrom
26fd909de0 Optimized for Remote Desktop / Terminal Server Sessions, also made it possible to enable/disable the zoomer.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2356 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-05 20:02:21 +00:00
RKrom
ddae26df89 Fixed leftovers
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2355 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-05 19:27:53 +00:00
RKrom
1ba5015305 Changes which calculate the amount of frames according to the time the animation should take, this makes the animation run equally long on all systems (independent of the refresh rate)
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2354 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-05 08:39:27 +00:00
RKrom
c7c61773a5 Fixed problem when selecting something after changing modes.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2353 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-04 13:41:55 +00:00
RKrom
4800bedde2 Made some changes which make the switch from region to window more interesting, for this I had to change some code so the "fade in/out" animations are running until finished.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2352 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-04 13:12:08 +00:00
JKlingen
010e43704d changed zoom location finder to try to find a position which is neither out of screen bounds nor intersecting with selected rectangle
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2351 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-03 21:22:05 +00:00
RKrom
d63c3806aa Fix issue where uneven size are calculated, this way we always have a plural of 4.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2350 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-03 21:11:35 +00:00
RKrom
aa8063ea88 Zoom size is now 20% of the smallest screen "range", usually the height, but if rotated CCW/CW this would be the width. This prevents the zoomer from being to large.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2349 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-03 14:24:55 +00:00
RKrom
672590cd3b Changes for the animation after discussions with Thomas. Mainly that the animation of the interactive capture STARTS from the Mouse-Cursor outwards.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2348 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-03 14:08:06 +00:00
JKlingen
3a5b3d63a9 fixed lower part of screen not being invalidated correctly in case of negative screen coordinates in multiscreen setup
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2346 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-02 18:47:22 +00:00
JKlingen
7be6f7ab2b refactored: get rid of confusing variables and calculating offsets for screen coordinates vs. bitmap coordinates.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2345 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-02 18:18:15 +00:00
JKlingen
05d9783a24 fixed issues with zoom positioning on multiscreen setup with negative screen coordinates
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2344 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-02 16:21:27 +00:00
RKrom
7c8b0f5988 Animation queuing.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2342 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-02 13:08:51 +00:00
RKrom
ce632b1496 Added changes for the zoom to animate relative to the cursor position. Also made the first changes to make sure the animation has a frame rate equal to the screen refresh.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2341 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-12-02 12:49:44 +00:00
RKrom
3b9cc41832 Added easing to the animations
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2340 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-30 11:44:34 +00:00
RKrom
03efcf8d17 Restored Jens his Animation logic, this does cause problems with the drawing as the size is not exact.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2339 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-30 06:54:26 +00:00
RKrom
ae38bd7ac2 code cleanup
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2338 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-29 17:20:16 +00:00
RKrom
c476d00b59 Fixed Cross-hair from Jens with pixel exact drawing.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2337 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-29 17:10:35 +00:00
RKrom
bc6b7c36e4 Changed key handler to make it possible to specify pixel-exact locations.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2336 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-29 16:51:41 +00:00
RKrom
3a9abafdc8 Recreated the changes from Jens
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2335 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-29 15:37:46 +00:00
RKrom
503a9daf63 Made changes to the animators, there now are different types but still all work linear.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2334 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-29 15:17:44 +00:00
RKrom
2aa53d444b Fixed the very old incorrect size information bug
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2333 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-29 14:02:23 +00:00
RKrom
22c58f739c Fixed last commit
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2332 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-29 08:16:13 +00:00
RKrom
e8196928e1 Added AnimationHelper to support the animations, this is still an initial form. Made the interactive mode work with this.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2331 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-28 21:25:46 +00:00
JKlingen
a1931b790d added simple "easing" effect to zoom animation
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2330 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-28 20:52:58 +00:00
JKlingen
8b0f4a75ed zoom crosshair optimizations for dark backgrounds
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2329 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-28 20:16:09 +00:00
RKrom
c5fef12c9b Cleaner fix for the Zoom bug
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2326 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-28 18:02:54 +00:00
RKrom
219fd48453 "fixed" that the ellipse of the zoom region didn't match the destination rectangle. It's not perfect yet, as the upper side is 91px, the lower side 92px... but this might be a problem with the pen, which draws a 9px thick line... to be continued.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2325 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-28 17:15:55 +00:00
RKrom
4efd779d86 Added an animation for the zoom area, this is just to show what we could do... might not be the final effect.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2319 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-27 08:07:01 +00:00
JKlingen
4cb72219a5 fixed invalidation area and small code improvements
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2318 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-25 21:21:23 +00:00
JKlingen
23f429d277 finally fixed last problems with position and invalidation of zoomer
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2317 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-25 20:18:57 +00:00
JKlingen
53c361424c fixed zoom position for multiscreen setup (however, some fixing has to be done for proper invalidation)
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2316 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-25 20:04:58 +00:00
RKrom
92053efdfc Fixed screenbounds checking for the zoom
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2315 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-25 19:37:41 +00:00
JKlingen
f6e214e12a fixed zoomarea offset in case of negative coordinates in screen layout (multiscreen)
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2314 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-25 17:07:05 +00:00
RKrom
69a88eeb25 Added checkerboard for Zooming where nothing is visible.... might need some logic to prevent drawing if it's not needed.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2313 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-25 13:41:06 +00:00
RKrom
675cdb1aae Changed the zooming to be in the Capture form itself, as it was really hard to change the shape. Now it's round...
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2312 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-25 12:57:57 +00:00
RKrom
67db97b13f Refactored the zoomForm to a zoomControl, with this we can prevent mouse events to happen. Also the current state seems to work very well, even with a larger size.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2306 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-23 22:17:47 +00:00
RKrom
5a1c5fd0eb Fixed the zoom, it was drawn incorrectly. Also changed the drawing to work with a timer, so the updates are made even if the mouse moves to quick. Added a bitblt method in the GDI32 class.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2294 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-18 11:18:20 +00:00
JKlingen
16ad103450 refactored: bitmapPos -> cursorPosOnBitmap
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2293 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-18 08:16:38 +00:00
JKlingen
c06e3e0288 fixed bad positioning of rulers, introduced with changes in revision 2290
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2292 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
2012-11-17 23:32:58 +00:00