[PATCH] fix issue #895: "Time" portion of calendar entries not scaling with font

Stefan Paul Noack <[email protected]> Sat, 25 Jul 2020 10:09:55 +0200
Newsgroups gmane.comp.gnome.evolution.devel
Message-ID <[email protected]>
--=-qHPoVEmKJ2zyywxGbluL
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

- fix clipping rectangle height:
	was hard-coded to 14 before, now row_height is used

- (flat drawing style) fix clipping rectangle width:
	text could be drawn outside the event rectangle, now clips
        correctly

- (rounded drawing style) scale the background pattern that separates
        the time portion from the body of the event:
	calculation was broken, new method produces the same result for
        96 DPI, but also works for larger values


--=-qHPoVEmKJ2zyywxGbluL
Content-Disposition: attachment;
	filename*0=0001-fix-issue-895-Time-portion-of-calendar-entries-not-s.pat;
	filename*1=ch
Content-Type: text/x-patch;
	name="0001-fix-issue-895-Time-portion-of-calendar-entries-not-s.patch";
	charset="UTF-8"
Content-Transfer-Encoding: base64

RnJvbSBiMjhlNTk2ZmVmOWVlOTZkOTZkZWJlZmUzZGMyZmVlYmRhYmU0MDY1IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gUGF1bCBOb2FjayA8c3RlZmFuQG5vYWNrLnNvZnR3
YXJlPgpEYXRlOiBTYXQsIDI1IEp1bCAyMDIwIDAxOjUyOjUwICswMjAwClN1YmplY3Q6IFtQQVRD
SF0gZml4IGlzc3VlICM4OTU6ICJUaW1lIiBwb3J0aW9uIG9mIGNhbGVuZGFyIGVudHJpZXMgbm90
CiBzY2FsaW5nIHdpdGggZm9udAoKLSBmaXggY2xpcHBpbmcgcmVjdGFuZ2xlIGhlaWdodDoKCXdh
cyBoYXJkLWNvZGVkIHRvIDE0IGJlZm9yZSwgbm93IHJvd19oZWlnaHQgaXMgdXNlZAoKLSAoZmxh
dCBkcmF3aW5nIHN0eWxlKSBmaXggY2xpcHBpbmcgcmVjdGFuZ2xlIHdpZHRoOgoJdGV4dCBjb3Vs
ZCBiZSBkcmF3biBvdXRzaWRlIHRoZSBldmVudCByZWN0YW5nbGUsIG5vdyBjbGlwcyBjb3JyZWN0
bHkKCi0gKHJvdW5kZWQgZHJhd2luZyBzdHlsZSkgc2NhbGUgdGhlIGJhY2tncm91bmQgcGF0dGVy
biB0aGF0IHNlcGFyYXRlcyB0aGUgdGltZSBwb3J0aW9uIGZyb20gdGhlIGJvZHkgb2YgdGhlIGV2
ZW50OgoJY2FsY3VsYXRpb24gd2FzIGJyb2tlbiwgbmV3IG1ldGhvZCBwcm9kdWNlcyB0aGUgc2Ft
ZSByZXN1bHQgZm9yIDk2IERQSSwgYnV0IGFsc28gd29ya3MgZm9yIGxhcmdlciB2YWx1ZXMKLS0t
CiBzcmMvY2FsZW5kYXIvZ3VpL2UtZGF5LXZpZXctbWFpbi1pdGVtLmMgfCAxMiArKysrKystLS0t
LS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvc3JjL2NhbGVuZGFyL2d1aS9lLWRheS12aWV3LW1haW4taXRlbS5jIGIvc3JjL2Nh
bGVuZGFyL2d1aS9lLWRheS12aWV3LW1haW4taXRlbS5jCmluZGV4IDM1ODQwZjI2MWIuLmQzNmMw
NGNkMTkgMTAwNjQ0Ci0tLSBhL3NyYy9jYWxlbmRhci9ndWkvZS1kYXktdmlldy1tYWluLWl0ZW0u
YworKysgYi9zcmMvY2FsZW5kYXIvZ3VpL2UtZGF5LXZpZXctbWFpbi1pdGVtLmMKQEAgLTQ3Nyw3
ICs0NzcsNyBAQCBkYXlfdmlld19tYWluX2l0ZW1fZHJhd19kYXlfZXZlbnQgKEVEYXlWaWV3TWFp
bkl0ZW0gKm1haW5faXRlbSwKIAkJZHJhd19jdXJ2ZWRfcmVjdGFuZ2xlIChjciwgeDAsIHkwLCBy
ZWN0X3dpZHRoLCByZWN0X2hlaWdodCwgcmFkaXVzKTsKIAl9CiAKLQlkYXRlX2ZyYWN0aW9uID0g
cmVjdF9oZWlnaHQgLyBkYXlfdmlldy0+cm93X2hlaWdodDsKKwlkYXRlX2ZyYWN0aW9uID0gKGRh
eV92aWV3LT5yb3dfaGVpZ2h0IC0gMTIpIC8gKGl0ZW1faCAtIDE1LjUpOwogCWludGVydmFsID0g
ZXZlbnQtPmVuZF9taW51dGUgLSBldmVudC0+c3RhcnRfbWludXRlOwogCiAJaWYgKChpbnRlcnZh
bCAvIHRpbWVfZGl2aXNpb25zKSA+PSAyKQpAQCAtNDk3LDkgKzQ5Nyw5IEBAIGRheV92aWV3X21h
aW5faXRlbV9kcmF3X2RheV9ldmVudCAoRURheVZpZXdNYWluSXRlbSAqbWFpbl9pdGVtLAogCQlp
dGVtX3ggKyBFX0RBWV9WSUVXX0JBUl9XSURUSCArIDEuNzUsIGl0ZW1feSArIDcuNzUsCiAJCWl0
ZW1feCArIEVfREFZX1ZJRVdfQkFSX1dJRFRIICsgMS43NSwgaXRlbV95ICsgaXRlbV9oIC0gNy43
NSk7CiAJaWYgKCFzaG9ydF9ldmVudCkgewotCQljYWlyb19wYXR0ZXJuX2FkZF9jb2xvcl9zdG9w
X3JnYmEgKHBhdCwgMSwgYmdfcmdiYS5yZWQsIGJnX3JnYmEuZ3JlZW4sIGJnX3JnYmEuYmx1ZSwg
MC44ICogYmdfcmdiYS5hbHBoYSk7Ci0JCWNhaXJvX3BhdHRlcm5fYWRkX2NvbG9yX3N0b3Bfcmdi
YSAocGF0LCAxIC8gKGRhdGVfZnJhY3Rpb24gKyAocmVjdF9oZWlnaHQgLyAxOCkpLCBiZ19yZ2Jh
LnJlZCwgYmdfcmdiYS5ncmVlbiwgYmdfcmdiYS5ibHVlLCAwLjggKiBiZ19yZ2JhLmFscGhhKTsK
LQkJY2Fpcm9fcGF0dGVybl9hZGRfY29sb3Jfc3RvcF9yZ2JhIChwYXQsIDEgLyAoZGF0ZV9mcmFj
dGlvbiArIChyZWN0X2hlaWdodCAvIDE4KSksIGJnX3JnYmEucmVkLCBiZ19yZ2JhLmdyZWVuLCBi
Z19yZ2JhLmJsdWUsIDAuNCAqIGJnX3JnYmEuYWxwaGEpOworCQljYWlyb19wYXR0ZXJuX2FkZF9j
b2xvcl9zdG9wX3JnYmEgKHBhdCwgMCwgYmdfcmdiYS5yZWQsIGJnX3JnYmEuZ3JlZW4sIGJnX3Jn
YmEuYmx1ZSwgMC44ICogYmdfcmdiYS5hbHBoYSk7CisJCWNhaXJvX3BhdHRlcm5fYWRkX2NvbG9y
X3N0b3BfcmdiYSAocGF0LCBkYXRlX2ZyYWN0aW9uLCBiZ19yZ2JhLnJlZCwgYmdfcmdiYS5ncmVl
biwgYmdfcmdiYS5ibHVlLCAwLjggKiBiZ19yZ2JhLmFscGhhKTsKKwkJY2Fpcm9fcGF0dGVybl9h
ZGRfY29sb3Jfc3RvcF9yZ2JhIChwYXQsIGRhdGVfZnJhY3Rpb24sIGJnX3JnYmEucmVkLCBiZ19y
Z2JhLmdyZWVuLCBiZ19yZ2JhLmJsdWUsIDAuNCAqIGJnX3JnYmEuYWxwaGEpOwogCQljYWlyb19w
YXR0ZXJuX2FkZF9jb2xvcl9zdG9wX3JnYmEgKHBhdCwgMSwgYmdfcmdiYS5yZWQsIGJnX3JnYmEu
Z3JlZW4sIGJnX3JnYmEuYmx1ZSwgMC44ICogYmdfcmdiYS5hbHBoYSk7CiAJfSBlbHNlIHsKIAkJ
Y2Fpcm9fcGF0dGVybl9hZGRfY29sb3Jfc3RvcF9yZ2JhIChwYXQsIDEsIGJnX3JnYmEucmVkLCBi
Z19yZ2JhLmdyZWVuLCBiZ19yZ2JhLmJsdWUsIDAuOCAqIGJnX3JnYmEuYWxwaGEpOwpAQCAtODE2
LDggKzgxNiw4IEBAIGRheV92aWV3X21haW5faXRlbV9kcmF3X2RheV9ldmVudCAoRURheVZpZXdN
YWluSXRlbSAqbWFpbl9pdGVtLAogCQljYWlyb19zYXZlIChjcik7CiAJCWNhaXJvX3JlY3Rhbmds
ZSAoCiAJCQljciwgaXRlbV94ICsgRV9EQVlfVklFV19CQVJfV0lEVEggKyAxLjc1LCBpdGVtX3kg
KyAyLjc1LAotCQkJaXRlbV93IC0gRV9EQVlfVklFV19CQVJfV0lEVEggLSAoZHJhd19mbGF0X2V2
ZW50cyA/IDAuMCA6IDQuNSksCi0JCQkxNCk7CisJCQlpdGVtX3cgLSBFX0RBWV9WSUVXX0JBUl9X
SURUSCAtIDQuNSwKKwkJCWRheV92aWV3LT5yb3dfaGVpZ2h0KTsKIAogCQljYWlyb19jbGlwIChj
cik7CiAJCWNhaXJvX25ld19wYXRoIChjcik7Ci0tIAoyLjI1LjEKCg==


--=-qHPoVEmKJ2zyywxGbluL
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
evolution-hackers mailing list
[email protected]
To change your list options or unsubscribe, visit ...
https://mail.gnome.org/mailman/listinfo/evolution-hackers

--=-qHPoVEmKJ2zyywxGbluL--