From kde-kimageshop Thu Aug 20 14:21:42 2015 From: Dmitry Kazakov Date: Thu, 20 Aug 2015 14:21:42 +0000 To: kde-kimageshop Subject: [calligra/calligra/2.9] krita: [FEATURE] Make color picking with shortcuts work in Wrap Around mode Message-Id: X-MARC-Message: https://marc.info/?l=kde-kimageshop&m=144008052406042 R2l0IGNvbW1pdCBjZGQ3YTYxNjJjYWUxYTBjOTIzMWE0Nzk1NmJmYmQ1NWEyZmE1M2FhIGJ5IERt aXRyeSBLYXpha292LgpDb21taXR0ZWQgb24gMjAvMDgvMjAxNSBhdCAxNDoyMS4KUHVzaGVkIGJ5 IGRrYXpha292IGludG8gYnJhbmNoICdjYWxsaWdyYS8yLjknLgoKW0ZFQVRVUkVdIE1ha2UgY29s b3IgcGlja2luZyB3aXRoIHNob3J0Y3V0cyB3b3JrIGluIFdyYXAgQXJvdW5kIG1vZGUKCkNDOmtp bWFnZXNob3BAa2RlLm9yZwpCVUc6MzM2MTIyCgpNICArMTkgICAtMyAgICBrcml0YS9wbHVnaW5z L3Rvb2xzL2RlZmF1bHR0b29scy9raXNfdG9vbF9jb2xvcnBpY2tlci5jYwpNICArMSAgICAtMSAg ICBrcml0YS91aS90b29sL2tpc190b29sX3BhaW50LmNjCk0gICsxNyAgIC0wICAgIGtyaXRhL3Vp L3Rvb2wva2lzX3Rvb2xfdXRpbHMuY3BwCk0gICs3ICAgIC0wICAgIGtyaXRhL3VpL3Rvb2wva2lz X3Rvb2xfdXRpbHMuaAoKaHR0cDovL2NvbW1pdHMua2RlLm9yZy9jYWxsaWdyYS9jZGQ3YTYxNjJj YWUxYTBjOTIzMWE0Nzk1NmJmYmQ1NWEyZmE1M2FhCgpkaWZmIC0tZ2l0IGEva3JpdGEvcGx1Z2lu cy90b29scy9kZWZhdWx0dG9vbHMva2lzX3Rvb2xfY29sb3JwaWNrZXIuY2MgYi9rcml0YS9wbHVn aW5zL3Rvb2xzL2RlZmF1bHR0b29scy9raXNfdG9vbF9jb2xvcnBpY2tlci5jYwppbmRleCA0ODA2 YTI3Li4xNjE1YzJhIDEwMDY0NAotLS0gYS9rcml0YS9wbHVnaW5zL3Rvb2xzL2RlZmF1bHR0b29s cy9raXNfdG9vbF9jb2xvcnBpY2tlci5jYworKysgYi9rcml0YS9wbHVnaW5zL3Rvb2xzL2RlZmF1 bHR0b29scy9raXNfdG9vbF9jb2xvcnBpY2tlci5jYwpAQCAtNTIsNiArNTIsOSBAQAogI2luY2x1 ZGUgPEtvQ2hhbm5lbEluZm8uaD4KICNpbmNsdWRlIDxLb01peENvbG9yc09wLmg+CiAKKyNpbmNs dWRlICJraXNfd3JhcHBlZF9yZWN0LmgiCisKKwogbmFtZXNwYWNlCiB7CiAvLyBUaGUgbG9jYXRp b24gb2YgdGhlIHNhbXBsZSBhbGwgdmlzaWJsZSBsYXllcnMgaW4gdGhlIGNvbWJvYm94CkBAIC0x NzcsNyArMTgwLDEyIEBAIHZvaWQgS2lzVG9vbENvbG9yUGlja2VyOjpwaWNrQ29sb3IoY29uc3Qg UVBvaW50RiYgcG9zKQogICAgIH0KIAogICAgIGlmIChtX2NvbmZpZy5yYWRpdXMgPT0gMSkgewot ICAgICAgICBkZXYtPnBpeGVsKHBvcy54KCksIHBvcy55KCksICZtX3BpY2tlZENvbG9yKTsKKyAg ICAgICAgUVBvaW50IHJlYWxQb3MgPSBwb3MudG9Qb2ludCgpOworICAgICAgICBpZiAoY3VycmVu dEltYWdlKCktPndyYXBBcm91bmRNb2RlUGVybWl0dGVkKCkpIHsKKyAgICAgICAgICAgIHJlYWxQ b3MgPSBLaXNXcmFwcGVkUmVjdDo6cHRUb1dyYXBwZWRQdChyZWFsUG9zLCBjdXJyZW50SW1hZ2Uo KS0+Ym91bmRzKCkpOworICAgICAgICB9CisKKyAgICAgICAgZGV2LT5waXhlbChyZWFsUG9zLngo KSwgcmVhbFBvcy55KCksICZtX3BpY2tlZENvbG9yKTsKICAgICB9CiAgICAgZWxzZSB7CiAKQEAg LTE5Myw3ICsyMDEsMTQgQEAgdm9pZCBLaXNUb29sQ29sb3JQaWNrZXI6OnBpY2tDb2xvcihjb25z dCBRUG9pbnRGJiBwb3MpCiAgICAgICAgIGZvciAoaW50IHkgPSAtbV9jb25maWcucmFkaXVzOyB5 IDw9IG1fY29uZmlnLnJhZGl1czsgeSsrKSB7CiAgICAgICAgICAgICBmb3IgKGludCB4ID0gLW1f Y29uZmlnLnJhZGl1czsgeCA8PSBtX2NvbmZpZy5yYWRpdXM7IHgrKykgewogICAgICAgICAgICAg ICAgIGlmICgoKHggKiB4KSArICh5ICogeSkpIDwgbV9jb25maWcucmFkaXVzICogbV9jb25maWcu cmFkaXVzKSB7Ci0gICAgICAgICAgICAgICAgICAgIGFjY2Vzc29yLT5tb3ZlVG8ocG9zLngoKSAr IHgsIHBvcy55KCkgKyB5KTsKKworICAgICAgICAgICAgICAgICAgICBRUG9pbnQgcmVhbFBvcyhw b3MueCgpICsgeCwgcG9zLnkoKSArIHkpOworCisgICAgICAgICAgICAgICAgICAgIGlmIChjdXJy ZW50SW1hZ2UoKS0+d3JhcEFyb3VuZE1vZGVQZXJtaXR0ZWQoKSkgeworICAgICAgICAgICAgICAg ICAgICAgICAgcmVhbFBvcyA9IEtpc1dyYXBwZWRSZWN0OjpwdFRvV3JhcHBlZFB0KHJlYWxQb3Ms IGN1cnJlbnRJbWFnZSgpLT5ib3VuZHMoKSk7CisgICAgICAgICAgICAgICAgICAgIH0KKworICAg ICAgICAgICAgICAgICAgICBhY2Nlc3Nvci0+bW92ZVRvKHJlYWxQb3MueCgpLCByZWFsUG9zLnko KSk7CiAgICAgICAgICAgICAgICAgICAgIHBpeGVscyA8PCBhY2Nlc3Nvci0+b2xkUmF3RGF0YSgp OwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAgLTI0OCw3ICsyNjMsOCBAQCB2 b2lkIEtpc1Rvb2xDb2xvclBpY2tlcjo6YmVnaW5QcmltYXJ5QWN0aW9uKEtvUG9pbnRlckV2ZW50 ICpldmVudCkKIAogICAgIFFQb2ludCBwb3MgPSBjb252ZXJ0VG9JbnRQaXhlbENvb3JkKGV2ZW50 KTsKICAgICAvLyB0aGUgY29sb3IgcGlja2luZyBoYXMgdG8gc3RhcnQgaW4gdGhlIHZpc2libGUg cGFydCBvZiB0aGUgbGF5ZXIKLSAgICBpZiAoIWN1cnJlbnRJbWFnZSgpLT5ib3VuZHMoKS5jb250 YWlucyhwb3MpKSB7CisgICAgaWYgKCFjdXJyZW50SW1hZ2UoKS0+Ym91bmRzKCkuY29udGFpbnMo cG9zKSAmJgorICAgICAgICAhY3VycmVudEltYWdlKCktPndyYXBBcm91bmRNb2RlUGVybWl0dGVk KCkpIHsKICAgICAgICAgZXZlbnQtPmlnbm9yZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQpk aWZmIC0tZ2l0IGEva3JpdGEvdWkvdG9vbC9raXNfdG9vbF9wYWludC5jYyBiL2tyaXRhL3VpL3Rv b2wva2lzX3Rvb2xfcGFpbnQuY2MKaW5kZXggNTJlYjgyMy4uZjcxMmMyZiAxMDA2NDQKLS0tIGEv a3JpdGEvdWkvdG9vbC9raXNfdG9vbF9wYWludC5jYworKysgYi9rcml0YS91aS90b29sL2tpc190 b29sX3BhaW50LmNjCkBAIC0zOTUsNyArMzk1LDcgQEAgYm9vbCBLaXNUb29sUGFpbnQ6OnBpY2tD b2xvcihjb25zdCBRUG9pbnRGICZkb2N1bWVudFBpeGVsLAogICAgIEtvQ29sb3IgY29sb3I7CiAg ICAgUUNvbG9yIHByZXZpZXdDb2xvcjsKIAotICAgIGlmIChLaXNUb29sVXRpbHM6OnBpY2soZGV2 aWNlLCBpbWFnZVBvaW50LCAmY29sb3IpKSB7CisgICAgaWYgKEtpc1Rvb2xVdGlsczo6cGlja1dy YXBwZWQoZGV2aWNlLCBpbWFnZVBvaW50LCAmY29sb3IsIGltYWdlKCkpKSB7CiAgICAgICAgIGNh bnZhcygpLT5yZXNvdXJjZU1hbmFnZXIoKS0+c2V0UmVzb3VyY2UocmVzb3VyY2UsIGNvbG9yKTsK IAogICAgICAgICBLaXNDYW52YXMyICoga2lzQ2FudmFzID0gZHluYW1pY19jYXN0PEtpc0NhbnZh czIqPihjYW52YXMoKSk7CmRpZmYgLS1naXQgYS9rcml0YS91aS90b29sL2tpc190b29sX3V0aWxz LmNwcCBiL2tyaXRhL3VpL3Rvb2wva2lzX3Rvb2xfdXRpbHMuY3BwCmluZGV4IDNiYjJkMDEuLjNk ZmUyMDYgMTAwNjQ0Ci0tLSBhL2tyaXRhL3VpL3Rvb2wva2lzX3Rvb2xfdXRpbHMuY3BwCisrKyBi L2tyaXRhL3VpL3Rvb2wva2lzX3Rvb2xfdXRpbHMuY3BwCkBAIC0yMSw5ICsyMSwyNiBAQAogI2lu Y2x1ZGUgPGtpc19wYWludF9kZXZpY2UuaD4KICNpbmNsdWRlIDxraXNfbGF5ZXIuaD4KICNpbmNs dWRlIDxraXNfZ3JvdXBfbGF5ZXIuaD4KKyNpbmNsdWRlIDxraXNfd3JhcHBlZF9yZWN0Lmg+Cisj aW5jbHVkZSA8a2lzX2ltYWdlLmg+CisKIAogbmFtZXNwYWNlIEtpc1Rvb2xVdGlscyB7CiAKKyAg ICBib29sIHBpY2tXcmFwcGVkKEtpc1BhaW50RGV2aWNlU1AgZGV2LCBRUG9pbnQgcG9zLCBLb0Nv bG9yICpjb2xvciwgS2lzSW1hZ2VTUCBpbWFnZSkKKyAgICB7CisgICAgICAgIGlmICghaW1hZ2Ut PnRyeUJhcnJpZXJMb2NrKCkpIHJldHVybiBmYWxzZTsKKworICAgICAgICBpZiAoaW1hZ2UtPndy YXBBcm91bmRNb2RlUGVybWl0dGVkKCkpIHsKKyAgICAgICAgICAgIHBvcyA9IEtpc1dyYXBwZWRS ZWN0OjpwdFRvV3JhcHBlZFB0KHBvcywgaW1hZ2UtPmJvdW5kcygpKTsKKyAgICAgICAgfQorCisg ICAgICAgIGJvb2wgcmVzdWx0ID0gcGljayhkZXYsIHBvcywgY29sb3IpOworCisgICAgICAgIGlt YWdlLT51bmxvY2soKTsKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9CisKICAgICBib29s IHBpY2soS2lzUGFpbnREZXZpY2VTUCBkZXYsIGNvbnN0IFFQb2ludCYgcG9zLCBLb0NvbG9yICpj b2xvcikKICAgICB7CiAgICAgICAgIEtJU19BU1NFUlQoZGV2KTsKZGlmZiAtLWdpdCBhL2tyaXRh L3VpL3Rvb2wva2lzX3Rvb2xfdXRpbHMuaCBiL2tyaXRhL3VpL3Rvb2wva2lzX3Rvb2xfdXRpbHMu aAppbmRleCAzMTY0YjNjLi41N2U1YmJkIDEwMDY0NAotLS0gYS9rcml0YS91aS90b29sL2tpc190 b29sX3V0aWxzLmgKKysrIGIva3JpdGEvdWkvdG9vbC9raXNfdG9vbF91dGlscy5oCkBAIC0yNiw2 ICsyNiwxMyBAQAogCiAKIG5hbWVzcGFjZSBLaXNUb29sVXRpbHMgeworCisvKioKKyAqIHJldHVy biB0aGUgY29sb3IgYXQgdGhlIGdpdmVuIHBvc2l0aW9uIG9uIHRoZSBnaXZlbiBwYWludCBkZXZp Y2UuCisgKiBOT1RFOiB0aGUgZnVuY3Rpb24gdGFrZXMgd3JhcGFyb3VuZCBtb2RlIGFuZCBpbWFn ZSBsb2NraW5nIGludG8gYWNjb3VudAorICovCitib29sIHBpY2tXcmFwcGVkKEtpc1BhaW50RGV2 aWNlU1AgZGV2LCBRUG9pbnQgcG9zLCBLb0NvbG9yICpjb2xvciwgS2lzSW1hZ2VTUCBpbWFnZSk7 CisKIC8qKgogICogcmV0dXJuIHRoZSBjb2xvciBhdCB0aGUgZ2l2ZW4gcG9zaXRpb24gb24gdGhl IGdpdmVuIHBhaW50IGRldmljZS4KICAqLwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpLcml0YSBtYWlsaW5nIGxpc3QKa2ltYWdlc2hvcEBrZGUub3JnCmh0 dHBzOi8vbWFpbC5rZGUub3JnL21haWxtYW4vbGlzdGluZm8va2ltYWdlc2hvcAo=