koffice/krita/ui/tool

[Boudewijn Rempt]

On Saturday 07 November 2009, Boudewijn Rempt wrote:
> SVN commit 1046086 by rempt:
> 
> Select from the projection with ctrl, from the current layer with
>  ctrl-shift
> 
> Follow Enkithan's advise.
> 
> Note: using the settings of the separate color picker tool is what
> Photoshop does, but that requires us to store the tool settings, which
> we currently don't do.
> 

Lukas correctly reminds me that I should have offered this and  "SVN commit 
1046077 Add color picker and pan mode to freehand tools" for review before 
committing. This is a mistake on my part, and I would like to invite some 
after-the-fact review. Should I first revert?

>  M  +2 -2      kis_tool_freehand.cc
> 
> 
> --- trunk/koffice/krita/ui/tool/kis_tool_freehand.cc #1046085:1046086
> @@ -130,7 +130,7 @@
>          return;
> 
>      // control-click gets the color at the current point. For now, only
>  with a ratio of 1 -    if (e->modifiers() == Qt::ControlModifier ) {
> +    if (e->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier)) {
>          if (e->button() == Qt::LeftButton)
>             
>  m_canvas->resourceProvider()->setResource(KoCanvasResource::ForegroundColo
> r, KisToolUtils::pick(currentNode()->paintDevice(), @@ -141,7 +141,7 @@
>                                                                          
>  convertToIntPixelCoord(e)));
> 
>      }
> -    else if (e->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier))
>  { +    else if (e->modifiers() == Qt::ControlModifier ) {
> 
>          if (e->button() == Qt::LeftButton)
>             
>  m_canvas->resourceProvider()->setResource(KoCanvasResource::ForegroundColo
> r,
> 


-- 
Boudewijn Rempt | http://www.valdyas.org