Commit Graph

4982 Commits

Author SHA1 Message Date
David Capello
97ebd70048 Update the status bar depending on the Editor text when the tool changes
It fixes a problem were PaletteView was clearing the StatusBar set by
the Editor when a quicktool keyboard shortcut was pressed.
2016-04-25 16:17:30 -03:00
David Capello
93c616cd7b Don't change two times the status bar text when the selected tool changes 2016-04-25 15:29:06 -03:00
David Capello
fc0cebc0dd Redraw editor only when selection handles must be redrawn 2016-04-25 15:26:46 -03:00
David Capello
a09b00dba8 Fix synchronization of different UI elements depending on the active tool
With this patch now the context bar shows the real active tool
preferences. For example, if we choose the option to use the Eraser
tool with right-click, now right-clicking will draw with the Eraser
brush size (instead of using the selected tool/left-click tool brush
size).

Changes:
* Removed the toolBox.activeTool() field from preferences
  (as the option isn't persisted between sessions)
* Added an observable app::tools::ActiveToolManager class to sync all
  UI elements that depend on the active tool and ink.
* Moved a lot of "active tool" logic from app::Editor to the
  new ActiveToolManager
* Moved app::tools::ToolLoopManager::Pointer as an indepedent
  app::tools::Pointer class
2016-04-25 15:20:53 -03:00
David Capello
f87cf93a55 Merge branch 'master' 2016-04-25 14:05:48 -03:00
David Capello
34d4489599 Merge pull request #924 from TheKK/brush_value_set
Apply brush size when clicking on brush icon
2016-04-25 14:04:06 -03:00
David Capello
d363f29840 Fix timeout in StatusBar::showTool() 2016-04-25 13:26:39 -03:00
David Capello
be063fded7 Merge pull request #1088 from winterheart/windows-compile
Fix compilation on MSVC for 32bit profile. (fix #1086)
2016-04-25 12:40:55 -03:00
Azamat H. Hackimov
eda468b272 Fix compilation on MSVC for 32bit profile.
Option "/SUBSYSTEM:WINDOWS,5.01" cause failing compilation checkings.
It is near to impossible compile current cmake-project on Windows XP,
and since this statement doing nothing else than CMake can do
themself, let's just delete them.

Tested on Windows 10 / MSVC 2015 on 32 and 64 bit profiles. Fixes
issue #1086.
2016-04-25 20:06:40 +05:00
David Capello
5f90ef7c9b Add properties in App to access directly to timeline/contextBar/workspace 2016-04-22 13:19:06 -03:00
David Capello
350cc2df2d Show text on console too when TRACE() is used on Windows 2016-04-22 12:27:00 -03:00
Azamat H. Hackimov
e7883b7d64 Fixing underlinking for gcc 4.9
Allegro4 backend uses XGrabPointer() from libX11.
Added ${X11_LIBRARIES} for she to resolve underlinking.
2016-04-22 13:42:26 +05:00
David Capello
59773e104e Update context bar when the pointer type changes
With this when we change between the stylus pen and eraser, the context
bar is updated with the correct brush settings for the tool.
2016-04-21 15:33:18 -03:00
David Capello
8e233878b6 Fix compilation error introduced in 119c87873f 2016-04-21 14:52:16 -03:00
David Capello
ac6d930d08 Missing PointerType in regular mouse movement events on OS X 2016-04-21 13:40:18 -03:00
David Capello
f447b457db Fix crash on OS X
This is strange because it didn’t happen before, I’m not sure if we
can call (or is “legal” to call) setURI() in this case.
2016-04-21 13:33:24 -03:00
David Capello
7c2786164d Remove unused variable 2016-04-21 13:31:24 -03:00
David Capello
56e663bca4 Merge branch 'eraser-support' 2016-04-21 13:22:23 -03:00
David Capello
9b05d2e8ef Add Wacom eraser support on OS X 2016-04-21 13:13:15 -03:00
David Capello
119c87873f Add she::PointerType::Cursor to identify puck like devices 2016-04-21 13:12:03 -03:00
David Capello
c5f7e9618b Use the real current tool preferences to draw and in the brush preview
The "real" current tool is the one in the editor returned by
getCurrentEditorTool() (which depends on quicktool modifiers
and right-click configuration).
2016-04-21 01:20:59 -03:00
David Capello
4198003446 Update context bar correctly when right-click changes the current tool
E.g. When right-click is configured with the Eraser tool, we must update
the context bar with the Eraser options in the context bar.
2016-04-21 00:57:06 -03:00
David Capello
7b4511a5df Unify she::InputDevice and ui::PointerType 2016-04-20 22:49:03 -03:00
David Capello
a58cbfbc1c Enable eraser support for Wacom tablets on Skia/Win back-end
Related to #610
2016-04-20 22:33:10 -03:00
David Capello
47708a6826 Include device in double-click event on Skia/Win 2016-04-20 22:30:45 -03:00
David Capello
955f86fc9e Add pressure and input device (mouse/stylus/eraser) info to mouse events
This is a first step to implement #610 and #710
2016-04-20 15:44:15 -03:00
David Capello
1c94dda072 Merge pen library into she library
This is the first step to add pen information to mouse events
(e.g. to known if a event came from the eraser or the regular tip).
2016-04-20 12:48:49 -03:00
David Capello
e723426214 Minor fix at pen_win.h
WTInfo is a macro defined as WTInfoW so anyway WTInfoW function was
being used.
2016-04-20 11:25:03 -03:00
David Capello
4be68ab5f0 Default folder for new files must be the latest used folder (fix #1068)
To behave in this way, the open/save dialog must receive a document
filename with an empty path.
2016-04-20 10:22:01 -03:00
David Capello
9cc8d43f0a Show color on status bar when mouse is over ColorTintShadeTone (and not captured) 2016-04-20 09:37:49 -03:00
David Capello
33003fb6f9 Show current grid tile in status bar when the grid is visible (fix #1075) 2016-04-19 15:51:34 -03:00
David Capello
fcca96d6a3 Add missing text in StatusBar::showColor() 2016-04-19 15:43:12 -03:00
David Capello
6661c0a32a Include RGB decimal values when we pick HSV colors (fix #1013) 2016-04-19 15:21:54 -03:00
David Capello
0993069e0b Add line length in status bar (fix #915) 2016-04-19 15:08:36 -03:00
David Capello
065188aea3 Include <cstring> needed in standby_state.cpp 2016-04-19 14:24:27 -03:00
David Capello
14ccfed3cc Merge branch 'cmake-optima' 2016-04-19 14:21:04 -03:00
David Capello
231b17615a Merge branch 'cmake-optima' of https://github.com/winterheart/aseprite into cmake-optima 2016-04-19 14:19:21 -03:00
David Capello
5d1b33b02e Add Ctrl+Page Down/Up to move through tabs 2016-04-19 14:18:50 -03:00
David Capello
ba234aea87 Update libpng 2016-04-19 14:10:53 -03:00
David Capello
756f7173e1 Don't use OpenSSL to compile curl 2016-04-19 14:09:38 -03:00
David Capello
c9c4838641 Fix gfx::SizeT::createUnion() function 2016-04-19 14:09:18 -03:00
David Capello
82f4d21507 Make Skia the default back-end on OS X
Related to #1066 and #1074
2016-04-19 14:09:01 -03:00
David Capello
75d545c976 Fix initial size indicator in status bar when we move pixels 2016-04-19 13:45:37 -03:00
David Capello
87ef48b50b Improve status bar with icons/automatically generated and re-used parts (fix #752) 2016-04-19 13:45:23 -03:00
Azamat H. Hackimov
18d201cf8e Use shared freetype2 on travis build tests. 2016-04-19 20:56:26 +05:00
Azamat H. Hackimov
b5f63d428c Refactoring CMake invocations
Using built-in function and modules for checking.
2016-04-19 20:56:04 +05:00
David Capello
af0267de03 Improve error reporting in gen utility when an invalid XML is used 2016-04-18 19:10:10 -03:00
David Capello
8de18946f8 Copy frame duration when we copy frames between two different sprites (fix #1023) 2016-04-18 16:53:07 -03:00
David Capello
fca32900bb Make base::string_to_lower/upper() use tolower/upper() for each Unicode char
It fixes issue #1065 because now UTF-8 strings are not destroyed by
these base::string_to_*() routines. This issue appears when we use
std::setlocale(), which was introduced in 27b55030e2
2016-04-18 16:38:37 -03:00
David Capello
736df91f8c Ignore freetype2 and zlib dirty changes
These submodules will be dirty after a compilation phase because there
are files that are renamed by cmake.
2016-04-18 15:23:46 -03:00