m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,647 Commits 1 Branch 0 Tags
Commit Graph

111 Commits

Author SHA1 Message Date
Yves Rizoud
020e57846b Layer preview now only appears if there's at least 2 layers. Fixed the preview not reappearing after using a keyboard shortcut (ex: scrolling with arrow keys) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1942 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-04-07 19:31:20 +00:00
Yves Rizoud
a137e063f0 Fix a crash that happened in Palette screen when right-clicking near top of screen: it opened the 'Copy/Paste' dropdown outside of screen edge. Now this dropdown menu only appears when you click in the palette area 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1938 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-25 14:44:29 +00:00
Yves Rizoud
2e5b97eb41 More fixes on layer preview. Layer buttons now activate on click instead of release. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1937 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-25 14:23:50 +00:00
Yves Rizoud
cd5b3346b0 More adjustments of layer preview : images less wide than a layer button are not zoomed more than normal size, and a max height is applied (Screen_height/4) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1936 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-24 19:50:06 +00:00
Yves Rizoud
c6479d22f6 Layer pop-up preview now has higher resolution (bypasses pixel ratio and menu zoom) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1935 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-24 18:55:49 +00:00
Yves Rizoud
99ce514ce8 Fix a case where the image could be in layer mode while the anim toolbar is visible. Note that from now on, if main and spare are single-image, changing the type of one will not change the type of the other. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1934 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-15 19:51:19 +00:00
Yves Rizoud
30e8079236 Fix crash when using Magnifier shortcut while the mouse is on a layer button (issue 480) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1932 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-13 19:55:51 +00:00
Yves Rizoud
145c9545e7 Fix the 'FX' button that didn't refresh its state when swapping pages between an image with Tilemap ON (button should be highlighted) and an image with Tilemap OFF (button not highlighted) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1928 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-11 16:50:28 +00:00
Yves Rizoud
5af6f7bd4d Fix crash of layer preview in some sizes, and removed overdraw 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1927 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-09 20:06:55 +00:00
Adrien Destugues
9ca899355c Fix zoom factor for layer preview. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1925 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-08 19:04:44 +00:00
Adrien Destugues
dcffab6c79 Fix layer preview : 
* Avoids running its own event loop and intercepting keyboard shortcuts
 * Show all the layers (lined up with the buttons)
 * Do not draw outside of screen when picture has strange dimensions.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1924 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-08 18:56:39 +00:00
Yves Rizoud
de6b3ac8d1 Toolbars now automatically switch to anim/layers when required 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1911 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-03-04 15:35:20 +00:00
Yves Rizoud
2343dcb54c Internal: Moved tooltips inside Buttons_pool, and Buttons_pool from globals.h to to windows.c/h for easier modification 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1908 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-02-27 01:36:40 +00:00
Yves Rizoud
cbcb7a6b8f Issue 233: Added mouse panning. Default is 'space' for new users, others need pick a key in Help screen. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1901 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-02-01 00:56:21 +00:00
Adrien Destugues
fb6f7f210d Remove useless goto label. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1889 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-01 17:51:32 +00:00
Adrien Destugues
cf617715d7 * Fix missing parenthses in function call (!). Still wondering why gcc compiled it... 
* Remove useless goto, code flow does what's needed already.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1888 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-01 16:29:04 +00:00
Adrien Destugues
dda62b043a Fix some bugs with layer quick-preview: 
* Compute the height of the preview matching the image aspect ratio, to avoid relying on the menu being shown. Also put the preview above the menu, to not hide other buttons.
 * Exit the popup loop when a button is clicked. This works for show/hide, but not for selecting a layer ? I don't get why... Any idea ?

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1887 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2012-01-01 16:15:53 +00:00
Adrien Destugues
1b805666e7 Add a quick-preview when hovering the layer buttons. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1884 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-12-31 17:16:44 +00:00
Yves Rizoud
496148d485 Tilemap effect: Added a menu to set options. Options saved and reloaded in .INI. Added support for shortcuts (but no helpfile so far, so you can't set them) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1870 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-11-13 23:21:59 +00:00
Yves Rizoud
8fb16e7089 Re-integrated anim in trunk, fixing the 999-layer limit at the same time 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1841 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-10-19 23:35:56 +00:00
Adrien Destugues
e875597964 Merge the "CPC Mode 5" branch to trunk. 
Note this alsoincludes the "oldies" branch.

This has the following consequences :
[C64]
 * Loading and saving of screen-only, and color-only C64 picture is removed
 * Loading and saving in FLI mode is now possible
 * FLI constraint checker : tries to convert your image to FLI format, and put all the areas where it couldn't find a solution in a separate layer for you to fixup
 * This is currently accessible only with a shortcut. Menu will come next.
[Amstrad CPC]
 * Loading and saving of pictures in "Mode 5" is now possible. This custom format allows overscan mode 1 with rasters on 2 inks and split rasters on a 3rd one.
 * Mode 5 constraint enforcer : will ensure you can only draw pictures that are valid in mode 5. Each ink is seen as a layer.
 * This is accessible from a new button in the FX menu.
[Generic]
 * Added patch as I saw it : platform that don't support reporting "free space" on disk will not display anything (instead of "0 bytesÃ" as before)
 * For other platforms, when the free space is 0, we now have a disk full message.

The merge was not straight forward. I hope I didn't break too much things.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1810 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-06-19 20:15:22 +00:00
Yves Rizoud
1f10338f60 Merged trunk into branches/mode5 (=update mode5 branch to latest) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1785 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-04-25 15:17:18 +00:00
Yves Rizoud
04761c79c4 Unbroke the file selector (was listing only hidden files instead of non-hidden). Lua: can browse the whole filesystem now 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1761 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-04-02 17:43:16 +00:00
Yves Rizoud
cdd7f21265 Fxed and simplified double-click handling in Listboxes (Skins window, Text window, Factory window). Double-clicking a font in Text window 'accepts' the rendering and closes the window. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1736 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-26 17:43:55 +00:00
Yves Rizoud
9cfefc9662 Fix display bug on menu buttons when comiled with 'unsigned character' (issue 423) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1734 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-26 15:56:45 +00:00
Yves Rizoud
107779edf5 Implemented double-click in Brush factory window. Still need to check/fix all other occurences of the listbox control (need to eliminate unnecessary refresh on double-click, or trigger a specific action instead) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1733 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-23 23:37:34 +00:00
Adrien Destugues
eba26aaa96 Merge trunk to the cpcmode5 branch. This gets us a more recent grafx2 with the cpcmode5 drawing. Now to make this mode optional so users can still work in regular mode :) 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1719 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-13 21:49:31 +00:00
Adrien Destugues
4e60f5ad74 Import the WIP CPC-Mode5 code from the sourcearchive 
git-svn-id: svn://pulkomandy.tk/GrafX2/branches/cpcmode5@1718 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-02-13 21:20:45 +00:00
Yves Rizoud
5d2dd927e4 Much work on color brushes (issue 362). You can rotate, resize, flip etc. without losing original palette. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1701 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2011-01-30 00:03:38 +00:00
Yves Rizoud
f24d4a55bd Lua script selector: can now browse directories. Todo: handle double-click. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1668 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-12-22 02:21:26 +00:00
Yves Rizoud
5fd72996c3 Virtual keyboard for string input 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1636 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-10-02 19:05:30 +00:00
Yves Rizoud
82e469a11e Now save all color ranges, not only the cycling ones. Only solid ranges (1 color) are discarded. Also fixed a few harmless compilation warnings 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1619 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-09-16 19:28:59 +00:00
Yves Rizoud
79dbd3722a Fix sliders displayed position. Pfew. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1609 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-09-11 00:37:43 +00:00
Yves Rizoud
e44eb104fa Fix the control issue with scroll bars. Still need to fix the displayed slider on them 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1608 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-09-10 23:34:14 +00:00
Yves Rizoud
6800cb7b9e Fix sliders controls bad offset - especially visible in Palette with RGB scale 3 to 16 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1607 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-09-07 00:13:10 +00:00
Yves Rizoud
97060bc146 Improved Gradation menu for cycling colors, including a horizontal scrollbar. Added helpfile. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1598 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-29 23:56:42 +00:00
Yves Rizoud
d78c33855b Drag-n-drop file in Grafx2 window is now cleanly prevented while a window is open: The OS's mouse cursor is the 'forbidden' sign. Preparatory work for horizontal slider controls. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1597 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-29 19:21:33 +00:00
Yves Rizoud
05e05d0d75 Keyboard shortcut for enabling/disabling color cycle. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1595 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-29 18:11:16 +00:00
Yves Rizoud
a5b5fa69e8 Fix window displacement (window didn't redraw when you released mouse button, only if you additionally moved mouse) 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1594 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-28 18:01:21 +00:00
Yves Rizoud
3ed9d0d652 Improve auto-detection of menu colors when using very small palettes 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1584 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-22 16:48:19 +00:00
Yves Rizoud
520da7d168 Reverted the change of input system (mostly, still needs more testing) Changed color cycling so it no longer needs a separate thread. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1581 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-19 00:33:06 +00:00
Yves Rizoud
858bab41c4 Drag-and-drop file: Question 'Discard unsaved changes' now works 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1580 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-17 17:22:46 +00:00
Yves Rizoud
4ea23b3e9a Color cycling based on the ranges in Grad menu. A speed slider has appeared. The speed data (and all cycling) is loaded from IFF/ILBM images from Deluxe Paint, Amiga and DOS versions. The data is not saved at the moment, so you shouldn't re-save cycling images 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1573 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-14 23:23:10 +00:00
Yves Rizoud
bd20d85cc9 Fix confirmation box when dragging a file on unsaved image. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1571 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-13 19:45:25 +00:00
Yves Rizoud
c83cd8c339 Drag and drop files: more stable. Unfinished 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1570 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-12 20:08:36 +00:00
Yves Rizoud
25796b9188 More work on SDL events. Also fixed an issue (very old?) where Grafx2 didn't accurately follow mouse movements when it's very busy, ie when using Continuous Freehand with a large brush or transparency. Now, as long as the setting Merge mouse is zero, all intermediate mouse positions are correctly buffered and played back. From my testing, up to 7 seconds will be memorized. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1568 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-11 00:07:55 +00:00
Yves Rizoud
e4d6dcbcbe Fixed sliders and repeatable buttons, for the change of timing method. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1567 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-09 22:56:06 +00:00
Yves Rizoud
951ec2d48a Still work on SDL events. Airbrush seems to work. Need to do repeatable buttons. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1565 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-08 19:59:17 +00:00
Adrien Destugues
5ee0b4943f * Use SDL_WaitEvent instead of SDL_PollEvent. 
* To avoid the program getting 'locked' when there is no user input (sliders, colorspray), we use a timer that queues events to make grafX2 act (and refresh the screen)

TODO :
 * To reduce cpu usage when idle even more, start the timer only when it's needed (colorspray is drawing, or a scrollbar is scrolling)
 * For now everyone uses the same timer, so the same delay. This means there is no fast-scroll and slow-scroll for sliders. Starting the timer with a different speed in each case would solve that
 * The event handling for sliders will currently react to any mouse event. Thismeans the slider will move faster if you slightly move the mouse while keeping in the button. Not what wewant, so weshoud all a timer_expired global and the slider should wait for that (and reset it when acknowledged).

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1556 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-08-06 15:40:01 +00:00
Adrien Destugues
17981ab03b * Fix build when lua disabled. 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1533 416bcca6-2ee7-4201-b75f-2eb2f807beb1
 2010-07-27 10:01:08 +00:00