22207 2008-11-12 10:29:31 -0800 [Gtk] Font sizes are not handled properly when updated at runtime 2008-11-16 06:12:44 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED http://www.twotoasts.de/bugs/index.php?do=details&task_id=164 Gtk P2 Normal --- 1 christian christian jakub.rusinek mrmazda oldest_to_newest 98486 0 christian 2008-11-12 10:29:31 -0800 The appropriate font handling code in WebKitWebView is only used in the initial display of the web view (screen-changed). The notification callback simply passes the values of the font size properties to WebCore, whithout taking the Pango factor and DPI into account. In the end this means that the font size is wrong as soon as the user attempts to change it at runtime, such as in a Preference dialog. 98537 1 25105 christian 2008-11-12 15:24:44 -0800 Created attachment 25105 Update fonts properly This change moves the DPI/ conversion into a helper function and applies the logic in the notification callback. From a bit of testing in Midori it seems to work properly now. 98908 2 25105 zecke 2008-11-15 17:12:11 -0800 Comment on attachment 25105 Update fonts properly Okay, this mostly moving things around and using the new webViewGetDPI API. 98927 3 christian 2008-11-16 06:12:44 -0800 2008-11-16 Christian Dywan <christian@twoasts.de> Reviewed by Holger Freyther. https://bugs.webkit.org/show_bug.cgi?id=22207 [Gtk] Font sizes are not handled properly when updated at runtime * webkit/webkitwebview.cpp: Move the DPI/ conversion into a helper function and apply the logic in the notification callback. 25105 2008-11-12 15:24:44 -0800 2008-11-15 17:12:11 -0800 Update fonts properly fontsettingsupdate.diff text/plain 3962 christian ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggMmM5MGI0ZS4uOGY1M2YzZCAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTEzMzIsMTEgKzEzMzIsMjggQEAgc3Rh dGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3 ZWJWaWV3Q2xhc3MpCiAgICAgZ190eXBlX2NsYXNzX2FkZF9wcml2YXRlKHdlYlZpZXdDbGFzcywg c2l6ZW9mKFdlYktpdFdlYlZpZXdQcml2YXRlKSk7CiB9CiAKK3N0YXRpYyBnZG91YmxlIHdlYlZp ZXdHZXREUEkoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnZG91YmxlIERQSSA9IGRl ZmF1bHREUEk7CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwxMCwwKQorICAgIEdka1NjcmVlbiog c2NyZWVuID0gZ3RrX3dpZGdldF9oYXNfc2NyZWVuKEdUS19XSURHRVQod2ViVmlldykpID8gZ3Rr X3dpZGdldF9nZXRfc2NyZWVuKEdUS19XSURHRVQod2ViVmlldykpIDogZ2RrX3NjcmVlbl9nZXRf ZGVmYXVsdCgpOworICAgIGlmIChzY3JlZW4pIHsKKyAgICAgICAgRFBJID0gZ2RrX3NjcmVlbl9n ZXRfcmVzb2x1dGlvbihzY3JlZW4pOworICAgICAgICAvLyBnZGtfc2NyZWVuX2dldF9yZXNvbHV0 aW9uKCkgcmV0dXJucyAtMSB3aGVuIG5vIERQSSBpcyBzZXQuCisgICAgICAgIGlmIChEUEkgPT0g LTEpCisgICAgICAgICAgICBEUEkgPSBkZWZhdWx0RFBJOworICAgIH0KKyNlbmRpZgorICAgIEFT U0VSVChEUEkgPiAwKTsKKyAgICByZXR1cm4gRFBJOworfQorCiBzdGF0aWMgdm9pZCB3ZWJraXRf d2ViX3ZpZXdfc2NyZWVuX2NoYW5nZWQoV2ViS2l0V2ViVmlldyogd2ViVmlldywgR2RrU2NyZWVu KiBwcmV2aW91c1NjcmVlbiwgZ3BvaW50ZXIgdXNlcmRhdGEpCiB7CiAgICAgV2ViS2l0V2ViVmll d1ByaXZhdGUqIHByaXYgPSB3ZWJWaWV3LT5wcml2OwogICAgIFdlYktpdFdlYlNldHRpbmdzKiB3 ZWJTZXR0aW5ncyA9IHByaXYtPndlYlNldHRpbmdzOwogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9 IGNvcmUod2ViVmlldyktPnNldHRpbmdzKCk7CisgICAgZ2RvdWJsZSBEUEkgPSB3ZWJWaWV3R2V0 RFBJKHdlYlZpZXcpOwogCiAgICAgZ3VpbnQgZGVmYXVsdEZvbnRTaXplLCBkZWZhdWx0TW9ub3Nw YWNlRm9udFNpemUsIG1pbmltdW1Gb250U2l6ZSwgbWluaW11bUxvZ2ljYWxGb250U2l6ZTsKIApA QCAtMTM0NywxNyArMTM2NCw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zY3JlZW5f Y2hhbmdlZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBHZGtTY3JlZW4qIHByCiAgICAgICAgICAg ICAgICAgICJtaW5pbXVtLWxvZ2ljYWwtZm9udC1zaXplIiwgJm1pbmltdW1Mb2dpY2FsRm9udFNp emUsCiAgICAgICAgICAgICAgICAgIE5VTEwpOwogCi0gICAgZ2RvdWJsZSBEUEkgPSBkZWZhdWx0 RFBJOwotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsMTAsMCkKLSAgICBHZGtTY3JlZW4qIHNjcmVl biA9IGd0a193aWRnZXRfaGFzX3NjcmVlbihHVEtfV0lER0VUKHdlYlZpZXcpKSA/IGd0a193aWRn ZXRfZ2V0X3NjcmVlbihHVEtfV0lER0VUKHdlYlZpZXcpKSA6IGdka19zY3JlZW5fZ2V0X2RlZmF1 bHQoKTsKLSAgICBpZiAoc2NyZWVuKSB7Ci0gICAgICAgIERQSSA9IGdka19zY3JlZW5fZ2V0X3Jl c29sdXRpb24oc2NyZWVuKTsKLSAgICAgICAgLy8gZ2RrX3NjcmVlbl9nZXRfcmVzb2x1dGlvbigp IHJldHVybnMgLTEgd2hlbiBubyBEUEkgaXMgc2V0LgotICAgICAgICBpZiAoRFBJID09IC0xKQot ICAgICAgICAgICAgRFBJID0gZGVmYXVsdERQSTsKLSAgICB9Ci0jZW5kaWYKLSAgICBBU1NFUlQo RFBJID4gMCk7CiAgICAgc2V0dGluZ3MtPnNldERlZmF1bHRGb250U2l6ZShkZWZhdWx0Rm9udFNp emUgLyA3Mi4wICogRFBJKTsKICAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdEZpeGVkRm9udFNpemUo ZGVmYXVsdE1vbm9zcGFjZUZvbnRTaXplIC8gNzIuMCAqIERQSSk7CiAgICAgc2V0dGluZ3MtPnNl dE1pbmltdW1Gb250U2l6ZShtaW5pbXVtRm9udFNpemUgLyA3Mi4wICogRFBJKTsKQEAgLTE0MTks NiArMTQyNSwxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRpbmdz KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgd2Via2l0X3dlYl92aWV3X3NjcmVlbl9jaGFu Z2VkKHdlYlZpZXcsIE5VTEwsIE5VTEwpOwogfQogCitzdGF0aWMgaW5saW5lIGdpbnQgcGl4ZWxz RnJvbVNpemUoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2ludCBzaXplKQoreworICAgIGdkb3Vi bGUgRFBJID0gd2ViVmlld0dldERQSSh3ZWJWaWV3KTsKKyAgICByZXR1cm4gc2l6ZSAvIDcyLjAg KiBEUEk7Cit9CisKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19zZXR0aW5nc19ub3RpZnko V2ViS2l0V2ViU2V0dGluZ3MqIHdlYlNldHRpbmdzLCBHUGFyYW1TcGVjKiBwc3BlYywgV2ViS2l0 V2ViVmlldyogd2ViVmlldykKIHsKICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBjb3JlKHdlYlZp ZXcpLT5zZXR0aW5ncygpOwpAQCAtMTQ0MywxMyArMTQ1NSwxMyBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRfd2ViX3ZpZXdfc2V0dGluZ3Nfbm90aWZ5KFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5n cywgR1BhcgogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3RyaW5nKCJzZXJpZi1mb250 LWZhbWlseSIpKQogICAgICAgICBzZXR0aW5ncy0+c2V0U2VyaWZGb250RmFtaWx5KGdfdmFsdWVf Z2V0X3N0cmluZygmdmFsdWUpKTsKICAgICBlbHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmlu ZygiZGVmYXVsdC1mb250LXNpemUiKSkKLSAgICAgICAgc2V0dGluZ3MtPnNldERlZmF1bHRGb250 U2l6ZShnX3ZhbHVlX2dldF9pbnQoJnZhbHVlKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXREZWZh dWx0Rm9udFNpemUocGl4ZWxzRnJvbVNpemUod2ViVmlldywgZ192YWx1ZV9nZXRfaW50KCZ2YWx1 ZSkpKTsKICAgICBlbHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmluZygiZGVmYXVsdC1tb25v c3BhY2UtZm9udC1zaXplIikpCi0gICAgICAgIHNldHRpbmdzLT5zZXREZWZhdWx0Rml4ZWRGb250 U2l6ZShnX3ZhbHVlX2dldF9pbnQoJnZhbHVlKSk7CisgICAgICAgIHNldHRpbmdzLT5zZXREZWZh dWx0Rml4ZWRGb250U2l6ZShwaXhlbHNGcm9tU2l6ZSh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9pbnQo JnZhbHVlKSkpOwogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3RyaW5nKCJtaW5pbXVt LWZvbnQtc2l6ZSIpKQotICAgICAgICBzZXR0aW5ncy0+c2V0TWluaW11bUZvbnRTaXplKGdfdmFs dWVfZ2V0X2ludCgmdmFsdWUpKTsKKyAgICAgICAgc2V0dGluZ3MtPnNldE1pbmltdW1Gb250U2l6 ZShwaXhlbHNGcm9tU2l6ZSh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9pbnQoJnZhbHVlKSkpOwogICAg IGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3RyaW5nKCJtaW5pbXVtLWxvZ2ljYWwtZm9udC1z aXplIikpCi0gICAgICAgIHNldHRpbmdzLT5zZXRNaW5pbXVtTG9naWNhbEZvbnRTaXplKGdfdmFs dWVfZ2V0X2ludCgmdmFsdWUpKTsKKyAgICAgICAgc2V0dGluZ3MtPnNldE1pbmltdW1Mb2dpY2Fs Rm9udFNpemUocGl4ZWxzRnJvbVNpemUod2ViVmlldywgZ192YWx1ZV9nZXRfaW50KCZ2YWx1ZSkp KTsKICAgICBlbHNlIGlmIChuYW1lID09IGdfaW50ZXJuX3N0cmluZygiYXV0by1sb2FkLWltYWdl cyIpKQogICAgICAgICBzZXR0aW5ncy0+c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KGdfdmFs dWVfZ2V0X2Jvb2xlYW4oJnZhbHVlKSk7CiAgICAgZWxzZSBpZiAobmFtZSA9PSBnX2ludGVybl9z dHJpbmcoImF1dG8tc2hyaW5rLWltYWdlcyIpKQo=