Commit graph

16 commits

Author SHA1 Message Date
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2
Move to qqc2
2018-04-12 11:26:55 -07:00
John Conklin II
213c35dab4
Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage
Bugfix for #12759 Overlays.editOverlay not applying subImage property
2018-04-12 10:34:17 -07:00
WolfGang
787127b149 move subImage recalculation to it's own method 2018-04-04 22:10:54 +01:00
WolfGang
f9bcd23463 make subimage update the image anchors 2018-04-04 17:28:55 +01:00
vladest
aefda9ef71 Merge branch 'master' into move_to_qqc2 2018-03-24 15:32:04 +01:00
David Rowe
a7cd5a240a Fix "text" overlay not clipping to right and bottom margins 2018-03-15 17:31:02 +13:00
vladest
c235deb6f0 Merge branch 'master' into move_to_qqc2 2018-01-19 23:01:04 +01:00
Liv Erickson
88ba5e5a00 change ImageOverlay to use AnimatedImage instead of Image to support .gif files in image overlay objects 2018-01-17 13:45:56 -08:00
vladest
2770650b65 Merge branch 'master' into move_to_qqc2 2017-12-12 18:48:41 +01:00
David Rowe
efd72be96f Fix image overlay's subImage property's width and height support 2017-12-07 12:05:46 +13:00
David Rowe
fd76c7a88b Fix erroneous 2D overlay unhandled property messages for bounds property 2017-12-01 17:40:34 +13:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
David Rowe
f9d6a7ba8d Fix image2d overlay color property 2016-06-08 14:04:02 +12:00
Brad Davis
27c38599a9 Snapshot dialogs 2016-02-01 11:07:48 -08:00
Brad Davis
8c19b95ea2 Fix oversized text, invalid color handling 2016-01-28 16:36:28 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00