159772 2008-03-24 03:20:49 +0000 [PATCH] Ctrl-mouse-wheel should allow zooming (plus some stuff) 2018-12-06 04:35:43 +0000 1 1 2 Applications kmplot general unspecified Compiled Sources Linux RESOLVED FIXED NOR wishlist --- 0 davidben kd.moeller finex kaabud-kde kneczaj samuel.brack https://commits.kde.org/kmplot/acf37fcffd9de49144a182e64ffc2d4c61916df9 1 oldest_to_newest 589079 0 davidben 2008-03-24 03:20:49 +0000 Version: 1.2.0 (using Devel) Installed from: Compiled sources OS: Linux Ctrl-mousewheel is a common shortcut for zooming in many apps, e.g. Dolphin and Gwenview. It would be nice if kmplot also followed this convention. Below is a patch to do that. In addition, the patch 1. Removes a variable that is unused due to foreach macro 2. Reworks the animation so that QTimer is used. This avoids spinning the CPU and interfering with the event loop. (Also, MAX is set to 11 now. The old code ran for (MAX+1)*16 ms due to the for loop having a <=. To make the time the same, I set it to 11.) 3. The animation isn't run if KGlobalSettings has them disabled. There is one slight change in the result in that the new graphs are drawn before the animation completes. Is the previous behavior preferred? (I can rework the patch to do that. It made consecutive ctrl-mousewheel zooms (i.e. perform the second zoom before the first's animation completes) kind of weird.) 589080 1 24033 davidben 2008-03-24 03:21:27 +0000 Created attachment 24033 the patch 858053 2 samuel.brack 2009-11-08 17:57:16 +0000 Very good idea! 1005766 3 finex 2010-08-17 22:04:53 +0000 *** Bug 193687 has been marked as a duplicate of this bug. *** 1005768 4 finex 2010-08-17 22:06:20 +0000 You should submit the patch on the review board. Follow the instruction on: http://techbase.kde.org/Contribute/Send_Patches Thanks. 1233685 5 cfeck 2012-03-07 22:36:02 +0000 *** Bug 295480 has been marked as a duplicate of this bug. *** 1824729 6 yurchor 2018-12-06 04:35:43 +0000 Git commit acf37fcffd9de49144a182e64ffc2d4c61916df9 by Yuri Chornoivan. Committed on 06/12/2018 at 04:35. Pushed by yurchor into branch 'master'. Implement zooming with Ctrl+mouse wheel Differential Revision: https://phabricator.kde.org/D17120 M +8 -3 doc/index.docbook M +68 -51 kmplot/view.cpp M +25 -1 kmplot/view.h https://commits.kde.org/kmplot/acf37fcffd9de49144a182e64ffc2d4c61916df9 24033 2008-03-24 03:21:27 +0000 2008-03-24 03:21:27 +0000 the patch PATCH_zoom.patch text/plain 5042 davidben SW5kZXg6IHZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHZpZXcuY3BwCShyZXZpc2lvbiA3ODkzNzgp CisrKyB2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzkxLDcgKzM5MSw2IEBACiAJLy8gc2xp ZGluZyB0aGUgdmlldyBhYm91dAogCXBhaW50ZXIuc2V0UmVuZGVySGludCggUVBhaW50ZXI6OkFu dGlhbGlhc2luZywgbV96b29tTW9kZSAhPSBUcmFuc2xhdGluZyApOwogCQotCWRvdWJsZSBudW1Q bG90cyA9IFhQYXJzZXI6OnNlbGYoKS0+bV91Zmt0LnNpemUoKTsKIAlkb3VibGUgYXQgPSAtMTsK IAlmb3JlYWNoICggRnVuY3Rpb24gKiBmdW5jdGlvbiwgWFBhcnNlcjo6c2VsZigpLT5tX3Vma3Qg KQogCXsKQEAgLTM0MjUsNiArMzQyNCwyNiBAQAogfQogCiAKK3ZvaWQgVmlldzo6d2hlZWxFdmVu dChRV2hlZWxFdmVudCAqZSkKK3sKKwlpZiAoZS0+bW9kaWZpZXJzKCkgJiBRdDo6Q29udHJvbE1v ZGlmaWVyKQorCXsKKwkJLy8gRGlzYWJsZSBhbmltYXRpb24/CisJCWlmIChlLT5kZWx0YSgpID4g MCkKKwkJeworCQkJem9vbUluKCBlLT5wb3MoKSwgZG91YmxlKFNldHRpbmdzOjp6b29tSW5TdGVw KCkpLzEwMC4wICk7CisJCX0KKwkJZWxzZQorCQl7CisJCQl6b29tSW4oIGUtPnBvcygpLCAoZG91 YmxlKFNldHRpbmdzOjp6b29tT3V0U3RlcCgpKS8xMDAuMCkgKyAxLjAgKTsKKwkJfQorCQllLT5h Y2NlcHQoKTsKKwkJcmV0dXJuOworCX0KKwlRV2lkZ2V0Ojp3aGVlbEV2ZW50KGUpOworfQorCisK IGJvb2wgVmlldzo6dXBkYXRlQ3Jvc3NoYWlyUG9zaXRpb24oKQogewogCVFQb2ludEYgbW91c2VQ b3MgPSBtYXBGcm9tR2xvYmFsKCBRQ3Vyc29yOjpwb3MoKSApOwpAQCAtMzY1Miw1NiArMzY3MSwz NiBAQAogCQkJbmV3Q29vcmRzLmJvdHRvbSgpID09IG1feW1heCApCiAJCXJldHVybjsKIAotCW1f em9vbU1vZGUgPSBBbmltYXRpbmdab29tOwotCi0JZG91YmxlIG9sZENvb3Jkc0FyZWEgPSAobV94 bWF4LW1feG1pbikgKiAobV95bWF4LW1feW1pbik7Ci0JZG91YmxlIG5ld0Nvb3Jkc0FyZWEgPSBu ZXdDb29yZHMud2lkdGgoKSAqIG5ld0Nvb3Jkcy5oZWlnaHQoKTsKLQotCVFQb2ludEYgYmVnaW5U TCwgYmVnaW5CUiwgZW5kVEwsIGVuZEJSOwotCi0JaWYgKCBvbGRDb29yZHNBcmVhID4gbmV3Q29v cmRzQXJlYSApCisJaWYgKCBLR2xvYmFsU2V0dGluZ3M6OmdyYXBoaWNFZmZlY3RzTGV2ZWwoKSAm IEtHbG9iYWxTZXR0aW5nczo6U2ltcGxlQW5pbWF0aW9uRWZmZWN0cyApCiAJewotCQkvLyB6b29t aW5nIGluCi0JCWJlZ2luVEwgPSBuZXdDb29yZHMudG9wTGVmdCgpOwotCQliZWdpbkJSID0gbmV3 Q29vcmRzLmJvdHRvbVJpZ2h0KCk7Ci0JCWVuZFRMID0gUVBvaW50RiggbV94bWluLCBtX3ltaW4g KTsKLQkJZW5kQlIgPSBRUG9pbnRGKCBtX3htYXgsIG1feW1heCApOwotCX0KLQllbHNlCi0Jewot CQkvLyB6b29taW5nIG91dAotCQliZWdpblRMID0gUVBvaW50RiggbV94bWluLCBtX3ltaW4gKTsK LQkJYmVnaW5CUiA9IFFQb2ludEYoIG1feG1heCwgbV95bWF4ICk7CisJCWRvdWJsZSBvbGRDb29y ZHNBcmVhID0gKG1feG1heC1tX3htaW4pICogKG1feW1heC1tX3ltaW4pOworCQlkb3VibGUgbmV3 Q29vcmRzQXJlYSA9IG5ld0Nvb3Jkcy53aWR0aCgpICogbmV3Q29vcmRzLmhlaWdodCgpOwogCi0J CWRvdWJsZSBreCA9ICggbV94bWluIC0gbV94bWF4ICkgLyAoIG5ld0Nvb3Jkcy5sZWZ0KCkgLSBu ZXdDb29yZHMucmlnaHQoKSApOwotCQlkb3VibGUga3kgPSAoIG1feW1pbiAtIG1feW1heCApIC8g KCBuZXdDb29yZHMudG9wKCkgLSBuZXdDb29yZHMuYm90dG9tKCkgKTsKKwkJaWYgKCBvbGRDb29y ZHNBcmVhID4gbmV3Q29vcmRzQXJlYSApCisJCXsKKwkJCS8vIHpvb21pbmcgaW4KKwkJCWRvdWJs ZSBreCA9ICggbmV3Q29vcmRzLmxlZnQoKSAtIG5ld0Nvb3Jkcy5yaWdodCgpICkgLyAoIG1feG1p biAtIG1feG1heCApOworCQkJZG91YmxlIGt5ID0gKCBuZXdDb29yZHMudG9wKCkgLSBuZXdDb29y ZHMuYm90dG9tKCkgKSAvICggbV95bWluIC0gbV95bWF4ICk7CiAKLQkJZG91YmxlIGx4ID0gbV94 bWluIC0gKGt4ICogbmV3Q29vcmRzLmxlZnQoKSk7Ci0JCWRvdWJsZSBseSA9IG1feW1pbiAtIChr eSAqIG5ld0Nvb3Jkcy50b3AoKSk7CisJCQlkb3VibGUgbHggPSBuZXdDb29yZHMubGVmdCgpIC0g KGt4ICogbV94bWluKTsKKwkJCWRvdWJsZSBseSA9IG5ld0Nvb3Jkcy50b3AoKSAtIChreSAqIG1f eW1pbik7CiAKLQkJZW5kVEwgPSBRUG9pbnRGKCAoa3ggKiBtX3htaW4pICsgbHgsIChreSAqIG1f eW1pbikgKyBseSApOwotCQllbmRCUiA9IFFQb2ludEYoIChreCAqIG1feG1heCkgKyBseCwgKGt5 ICogbV95bWF4KSArIGx5ICk7Ci0JfQorCQkJbV9hbmltSW5mby5iZWdpblRMID0gUVBvaW50Rigg KGt4ICogbmV3Q29vcmRzLmxlZnQoKSkgKyBseCwgKGt5ICogbmV3Q29vcmRzLnRvcCgpKSArIGx5 ICk7CisJCQltX2FuaW1JbmZvLmJlZ2luQlIgPSBRUG9pbnRGKCAoa3ggKiBuZXdDb29yZHMucmln aHQoKSkgKyBseCwgKGt5ICogbmV3Q29vcmRzLmJvdHRvbSgpKSArIGx5ICk7CisJCQltX2FuaW1J bmZvLmVuZFRMID0gbmV3Q29vcmRzLnRvcExlZnQoKTsKKwkJCW1fYW5pbUluZm8uZW5kQlIgPSBu ZXdDb29yZHMuYm90dG9tUmlnaHQoKTsKKwkJfQorCQllbHNlCisJCXsKKwkJCS8vIHpvb21pbmcg b3V0CisJCQltX2FuaW1JbmZvLmJlZ2luVEwgPSBuZXdDb29yZHMudG9wTGVmdCgpOworCQkJbV9h bmltSW5mby5iZWdpbkJSID0gbmV3Q29vcmRzLmJvdHRvbVJpZ2h0KCk7CisJCQltX2FuaW1JbmZv LmVuZFRMID0gUVBvaW50RiggbV94bWluLCBtX3ltaW4gKTsKKwkJCW1fYW5pbUluZm8uZW5kQlIg PSBRUG9pbnRGKCBtX3htYXgsIG1feW1heCApOworCQl9CisJCW1fYW5pbUluZm8uc3RlcCA9IDA7 CiAKLQlkb3VibGUgTUFYID0gMTA7Ci0JZG91YmxlIG1zID0gTUFYKjE2OyAvLyBtaWxsaXNlY29u ZHMgdG8gYW5pbWF0ZSBmb3IKLQotCWZvciAoIGludCBpID0gMDsgaSA8PSBNQVg7ICsraSApCi0J ewotCQlRVGltZSB0OwotCQl0LnN0YXJ0KCk7Ci0KLQkJUVBvaW50RiB0bCA9ICgoIGkqZW5kVEwp ICsgKChNQVgtaSkqYmVnaW5UTCkpIC8gTUFYOwotCQlRUG9pbnRGIGJyID0gKCggaSplbmRCUikg KyAoKE1BWC1pKSpiZWdpbkJSKSkgLyBNQVg7Ci0KLQkJbV9hbmltYXRlWm9vbVJlY3QgPSBRUmVj dEYoIHRsLCBRU2l6ZUYoIGJyLngoKS10bC54KCksIGJyLnkoKS10bC55KCkgKSApOwotCi0JCXJl cGFpbnQoKTsKLQotCQlpZiAoIGkgPT0gTUFYICkKLQkJCWJyZWFrOwotCQllbHNlIHdoaWxlICgg dC5lbGFwc2VkKCkgPCAobXMvTUFYKSApCi0JCQk7IC8vIGRvIG5vdGhpbmcKKwkJUVRpbWVyOjpz aW5nbGVTaG90KCAwLCB0aGlzLCBTTE9UKHVwZGF0ZUFuaW0oKSkgKTsKIAl9CiAJCiAJbV94bWlu ID0gbmV3Q29vcmRzLmxlZnQoKTsKQEAgLTM3MTgsOCArMzcxNywzMCBAQAogCU1haW5EbGc6OnNl bGYoKS0+cmVxdWVzdFNhdmVDdXJyZW50U3RhdGUoKTsKIAogCWRyYXdQbG90KCk7IC8vdXBkYXRl IGFsbCBncmFwaHMKK30KIAotCW1fem9vbU1vZGUgPSBOb3JtYWw7Cit2b2lkIFZpZXc6OnVwZGF0 ZUFuaW0oKQoreworCWNvbnN0IGludCBNQVggPSAxMTsKKwljb25zdCBpbnQgQU5JTV9NUyA9IE1B WCoxNjsKKworCWlmIChtX2FuaW1JbmZvLnN0ZXAgPj0gTUFYKQorCXsKKwkJbV96b29tTW9kZSA9 IE5vcm1hbDsKKwl9CisJZWxzZQorCXsKKwkJaW50IGkgPSBtX2FuaW1JbmZvLnN0ZXA7CisJCW1f em9vbU1vZGUgPSBBbmltYXRpbmdab29tOworCQlRUG9pbnRGIHRsID0gKCggaSptX2FuaW1JbmZv LmVuZFRMKSArICgoTUFYLTEtaSkqbV9hbmltSW5mby5iZWdpblRMKSkgLyAoTUFYLTEpOworCQlR UG9pbnRGIGJyID0gKCggaSptX2FuaW1JbmZvLmVuZEJSKSArICgoTUFYLTEtaSkqbV9hbmltSW5m by5iZWdpbkJSKSkgLyAoTUFYLTEpOworCisJCW1fYW5pbWF0ZVpvb21SZWN0ID0gUVJlY3RGKCB0 bCwgUVNpemVGKCBici54KCktdGwueCgpLCBici55KCktdGwueSgpICkgKTsKKworCQlRVGltZXI6 OnNpbmdsZVNob3QoIEFOSU1fTVMvTUFYLCB0aGlzLCBTTE9UKHVwZGF0ZUFuaW0oKSkgKTsKKwkJ bV9hbmltSW5mby5zdGVwKys7CisJfQorCXJlcGFpbnQoKTsKIH0KIAogCkluZGV4OiB2aWV3LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gdmlldy5oCShyZXZpc2lvbiA3ODkzNzgpCisrKyB2aWV3LmgJKHdvcmtp bmcgY29weSkKQEAgLTIzNSw2ICsyMzUsNyBAQAogCQl2b2lkIGtleVByZXNzRXZlbnQoUUtleUV2 ZW50ICogKTsKIAkJLy8vIGNhbGxlZCB3aGVuIGEgbW91c2Uga2V5IGlzIHJlbGVhc2VkCiAJCXZv aWQgbW91c2VSZWxlYXNlRXZlbnQgKCBRTW91c2VFdmVudCAqIGUgKTsKKwkJdm9pZCB3aGVlbEV2 ZW50KFFXaGVlbEV2ZW50ICpldmVudCk7CiAJCS8vLyBJcyBuZWVkZWQgdG8gYmUgcmVpbXBsZW1l bnQgc28gdGhhdCB0aGUgdXNlciBjYW4gc3RvcCBhIHByZXZpZXctZHJhd2luZwogCQlib29sIGV2 ZW50KCBRRXZlbnQgKiBlICk7CiAJCS8qKgpAQCAtNjE0LDYgKzYxNSwxOCBAQAogCQkKIAkJUVRl eHRFZGl0ICogbV90ZXh0RWRpdDsgLy8vPCBDb250YWlucyBtX3RleHREb2N1bWVudAogCQlRVGV4 dERvY3VtZW50ICogbV90ZXh0RG9jdW1lbnQ7IC8vLzwgVXNlZCBmb3IgbGF5b3V0IG9mIGF4aXMg bGFiZWxzCisKKwkJLy8vIFZhcmlvdXMgdGhpbmdzIGZvciB0aGUgYW5pbWF0aW9uCisJCXN0cnVj dCBBbmltSW5mbworCQl7CisJCQlRUG9pbnRGIGJlZ2luVEw7CisJCQlRUG9pbnRGIGJlZ2luQlI7 CisJCQlRUG9pbnRGIGVuZFRMOworCQkJUVBvaW50RiBlbmRCUjsKKwkJCWludCBzdGVwOworCQl9 IG1fYW5pbUluZm87CisJcHJpdmF0ZSBzbG90czoKKwkJdm9pZCB1cGRhdGVBbmltKCk7CiB9Owog CiAjZW5kaWYgLy8gVmlld19pbmNsdWRlZAo=