Skip to content
Snippets Groups Projects

Resolve "colorpicker doesn't consider border correctly"

Merged d.kilic requested to merge 57-colorpicker-doesn-t-consider-border-correctly into master
All threads resolved!

Color picker now uses getMousePosOnImage to get the mouse position instead of relying on its own logic. This solves problems with border and distortion.

Also, the RectPlotItem now does not delete the last map, but instead replaces it with a default one (letting everything through), so the indices still work.

Closes #57 (closed)

Edited by d.kilic

Merge request reports

Approved by
Test summary results are being parsed

Merged by d.kilicd.kilic 4 years ago (Nov 20, 2020 9:13am UTC)

Merge details

  • Changes merged into master with 09e80bc0 (commits were squashed).
  • Did not delete the source branch.

Pipeline #26428 passed

Pipeline passed for 09e80bc0 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Schrödter, Tobias
  • Schrödter, Tobias
  • d.kilic added 9 commits

    added 9 commits

    • 96abba88...e405fb4e - 6 commits from branch master
    • 241b3ae1 - Change clickedColor's type to QColor
    • 1c8c6716 - Errormessage for wrong index at call of delMap
    • 6c67ef76 - Merge branch 'master' into 57-colorpicker-doesn-t-consider-border-correctly

    Compare with previous version

  • Schrödter, Tobias resolved all threads

    resolved all threads

  • Schrödter, Tobias approved this merge request

    approved this merge request

  • d.kilic added 21 commits

    added 21 commits

    • 6c67ef76...669b4cb4 - 14 commits from branch master
    • f23ba5e5 - Fixed: not considering border correctly in color picker
    • a059478e - - Using helper function to find mouse position
    • b4d5b4b0 - Fixed unit test and added safety guards around map getters
    • d07dbfb7 - Creating colorMaps with default color, so invalid color can be used as sign for currupted map
    • 356c906d - Never let RectPlotItem mMaps list be empty
    • 16455079 - Change clickedColor's type to QColor
    • bc08b2f7 - Errormessage for wrong index at call of delMap

    Compare with previous version

  • d.kilic mentioned in commit 09e80bc0

    mentioned in commit 09e80bc0

  • merged

  • Please register or sign in to reply
    Loading