From koffice-devel Mon Jun 25 10:15:36 2001 From: Toshitaka Fujioka Date: Mon, 25 Jun 2001 10:15:36 +0000 To: koffice-devel Subject: Bug fix patch for KPresenter (#16406, #25408) X-MARC-Message: https://marc.info/?l=koffice-devel&m=99346391822322 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_0UDHUG9D5S1232HA1OBB" --------------Boundary-00=_0UDHUG9D5S1232HA1OBB Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Hello, This patch fixes bug of #16406 and #25408. Contents of bug report (#16406): ------------------------------------------- It is hard to move or resize objects that aren't on the top layer in kpresenter. However, it is not too difficult to select them. I suggest that when mouse button + motion is detected, you attempt to apply the drag to any selected objects before trying to apply it to the topmost objects. For instance, if I have an image whose handles are below a text box, I should be able to select it by clicking on an exposed portion of the image to select it (which draws the image's handles). Then, when I move over a handle and click+drag to resize, it resizes the image instead of selecting and moving the text box. -------------------------------------------- Contents of bug report (#25408): --------------------------------------------------------------- If I select an image in the background which is overlapped by a text frame in the foreground and I try to resize tbis image by dragging an edge on it which is in the area of the text frame, the focus switches to the text frame. This behaviour should, in my opinion, be abolished. ---------------------------------------------------------------- And, I display warning when user execute "Lowe object(s)" and "Raise object(s)" if object more than one is selected. (not relational the group object) Please review. -- Toshitaka Fujioka http://www.kde.org The K Desktop Environment Project fujioka@kde.org http://www.kde.gr.jp Japan KDE User's Group toshitaka@kde.gr.jp -- We offer the best Desktop Environment to you. (This is my goal. ;-)) -- --------------Boundary-00=_0UDHUG9D5S1232HA1OBB Content-Type: text/plain; charset="iso-8859-1"; name="koffice-kpresenter-%2316406-%2325408-fix-20010625.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="koffice-kpresenter-%2316406-%2325408-fix-20010625.diff" ZGlmZiAtdXIga29mZmljZS5vcmlnL2twcmVzZW50ZXIva3ByZXNlbnRlcl9kb2MuY2Mga29mZmlj ZS9rcHJlc2VudGVyL2twcmVzZW50ZXJfZG9jLmNjCi0tLSBrb2ZmaWNlLm9yaWcva3ByZXNlbnRl ci9rcHJlc2VudGVyX2RvYy5jYwlNb24gSnVuIDI1IDE4OjQxOjUzIDIwMDEKKysrIGtvZmZpY2Uv a3ByZXNlbnRlci9rcHJlc2VudGVyX2RvYy5jYwlNb24gSnVuIDI1IDE4OjQzOjU2IDIwMDEKQEAg LTE1OCw2ICsxNTgsNyBAQAogICAgIHBhc3RlWE9mZnNldCA9IHBhc3RlWU9mZnNldCA9IDA7CiAg ICAgaWdub3JlU3RpY2t5ID0gVFJVRTsKICAgICBtX3BpeG1hcE1hcCA9IDBMOworICAgIHJhaXNl QW5kTG93ZXJPYmplY3QgPSBmYWxzZTsKIAogICAgIF9oZWFkZXIgPSBuZXcgS1BUZXh0T2JqZWN0 KCB0aGlzICk7CiAgICAgX2hlYWRlci0+c2V0RHJhd0VkaXRSZWN0KCBmYWxzZSApOwpAQCAtMjUx Niw2ICsyNTE3LDggQEAKICAgICBMb3dlclJhaXNlQ21kICpsckNtZCA9IG5ldyBMb3dlclJhaXNl Q21kKCBpMThuKCAiTG93ZXIgT2JqZWN0KHMpIiApLCBfb2JqZWN0TGlzdCwgX25ldywgdGhpcyAp OwogICAgIGxyQ21kLT5leGVjdXRlKCk7CiAgICAgX2NvbW1hbmRzLmFkZENvbW1hbmQoIGxyQ21k ICk7CisKKyAgICByYWlzZUFuZExvd2VyT2JqZWN0ID0gdHJ1ZTsKIH0KIAogLyo9PT09PT09PT09 PT09PT09PT09PT09PT09IHJhaXNlIG9iamVjdCA9PT09PT09PT09PT09PT09PT09PT09PT09Ki8K QEAgLTI1NDEsNiArMjU0NCw4IEBACiAgICAgTG93ZXJSYWlzZUNtZCAqbHJDbWQgPSBuZXcgTG93 ZXJSYWlzZUNtZCggaTE4biggIlJhaXNlIE9iamVjdChzKSIgKSwgX29iamVjdExpc3QsIF9uZXcs IHRoaXMgKTsKICAgICBsckNtZC0+ZXhlY3V0ZSgpOwogICAgIF9jb21tYW5kcy5hZGRDb21tYW5k KCBsckNtZCApOworCisgICAgcmFpc2VBbmRMb3dlck9iamVjdCA9IHRydWU7CiB9CiAKIC8qPT09 PT09PT09PT09PT09PT09PSBpbnNlcnQgYSBwaWN0dXJlID09PT09PT09PT09PT09PT09PT09PT09 PT09Ki8KZGlmZiAtdXIga29mZmljZS5vcmlnL2twcmVzZW50ZXIva3ByZXNlbnRlcl9kb2MuaCBr b2ZmaWNlL2twcmVzZW50ZXIva3ByZXNlbnRlcl9kb2MuaAotLS0ga29mZmljZS5vcmlnL2twcmVz ZW50ZXIva3ByZXNlbnRlcl9kb2MuaAlNb24gSnVuIDI1IDE4OjQxOjUzIDIwMDEKKysrIGtvZmZp Y2Uva3ByZXNlbnRlci9rcHJlc2VudGVyX2RvYy5oCU1vbiBKdW4gMjUgMTg6NDQ6MjggMjAwMQpA QCAtMjk4LDYgKzI5OCw4IEBACiAKICAgICB2b2lkIGluaXRDb25maWcoKTsKIAorICAgIGJvb2wg cmFpc2VBbmRMb3dlck9iamVjdDsKKwogcHVibGljIHNsb3RzOgogICAgIHZvaWQgbW92ZVBhZ2Uo IGludCBmcm9tLCBpbnQgdG8gKTsKICAgICB2b2lkIGNvcHlQYWdlKCBpbnQgZnJvbSwgaW50IHRv ICk7CmRpZmYgLXVyIGtvZmZpY2Uub3JpZy9rcHJlc2VudGVyL2twcmVzZW50ZXJfdmlldy5jYyBr b2ZmaWNlL2twcmVzZW50ZXIva3ByZXNlbnRlcl92aWV3LmNjCi0tLSBrb2ZmaWNlLm9yaWcva3By ZXNlbnRlci9rcHJlc2VudGVyX3ZpZXcuY2MJTW9uIEp1biAyNSAxODo0MTo1MyAyMDAxCisrKyBr b2ZmaWNlL2twcmVzZW50ZXIva3ByZXNlbnRlcl92aWV3LmNjCU1vbiBKdW4gMjUgMTg6NDU6NTUg MjAwMQpAQCAtNTUsNiArNTUsNyBAQAogCiAjaW5jbHVkZSA8a2ZpbGVkaWFsb2cuaD4KICNpbmNs dWRlIDxrbWVzc2FnZWJveC5oPgorI2luY2x1ZGUgPGtub3RpZnljbGllbnQuaD4KICNpbmNsdWRl IDxrc3RkYWN0aW9uLmg+CiAjaW5jbHVkZSA8a2FwcC5oPgogI2luY2x1ZGUgPGtpby9uZXRhY2Nl c3MuaD4KQEAgLTczOSwxNSArNzQwLDI3IEBACiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCiB2b2lkIEtQcmVzZW50ZXJW aWV3OjpleHRyYVJhaXNlKCkKIHsKLSAgICBwYWdlLT5zZXRUb29sRWRpdE1vZGUoIFRFTV9NT1VT RSApOwotICAgIG1fcEtQcmVzZW50ZXJEb2MtPnJhaXNlT2JqcyggeE9mZnNldCwgeU9mZnNldCAp OworICAgIGlmICggcGFnZS0+b25seU9uZVNlbGVjdGVkT2JqZWN0KCkgKSB7CisgICAgICAgIHBh Z2UtPnNldFRvb2xFZGl0TW9kZSggVEVNX01PVVNFICk7CisgICAgICAgIG1fcEtQcmVzZW50ZXJE b2MtPnJhaXNlT2JqcyggeE9mZnNldCwgeU9mZnNldCApOworICAgIH0KKyAgICBlbHNlIHsKKyAg ICAgICAgS05vdGlmeUNsaWVudDo6YmVlcCgpOworICAgICAgICBLTWVzc2FnZUJveDo6aW5mb3Jt YXRpb24oIHRoaXMsIGkxOG4oIlBsZWFzZSBzZWxlY3Qgb25seSBvbmUgb2JqZWN0LiIpLCBpMThu KCJSYWlzZSBPYmplY3QocykiKSApOworICAgIH0KIH0KIAogLyo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwogdm9pZCBLUHJl c2VudGVyVmlldzo6ZXh0cmFMb3dlcigpCiB7Ci0gICAgcGFnZS0+c2V0VG9vbEVkaXRNb2RlKCBU RU1fTU9VU0UgKTsKLSAgICBtX3BLUHJlc2VudGVyRG9jLT5sb3dlck9ianMoIHhPZmZzZXQsIHlP ZmZzZXQgKTsKKyAgICBpZiAoIHBhZ2UtPm9ubHlPbmVTZWxlY3RlZE9iamVjdCgpICkgeworICAg ICAgICBwYWdlLT5zZXRUb29sRWRpdE1vZGUoIFRFTV9NT1VTRSApOworICAgICAgICBtX3BLUHJl c2VudGVyRG9jLT5sb3dlck9ianMoIHhPZmZzZXQsIHlPZmZzZXQgKTsKKyAgICB9CisgICAgZWxz ZSB7CisgICAgICAgIEtOb3RpZnlDbGllbnQ6OmJlZXAoKTsKKyAgICAgICAgS01lc3NhZ2VCb3g6 OmluZm9ybWF0aW9uKCB0aGlzLCBpMThuKCJQbGVhc2Ugc2VsZWN0IG9ubHkgb25lIG9iamVjdC4i KSwgaTE4bigiTG93ZXIgT2JqZWN0KHMpIikgKTsKKyAgICB9CiB9CiAKIC8qPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KZGlm ZiAtdXIga29mZmljZS5vcmlnL2twcmVzZW50ZXIvcGFnZS5jYyBrb2ZmaWNlL2twcmVzZW50ZXIv cGFnZS5jYwotLS0ga29mZmljZS5vcmlnL2twcmVzZW50ZXIvcGFnZS5jYwlNb24gSnVuIDI1IDE4 OjQxOjUzIDIwMDEKKysrIGtvZmZpY2Uva3ByZXNlbnRlci9wYWdlLmNjCU1vbiBKdW4gMjUgMTg6 NDg6NDQgMjAwMQpAQCAtMTA5LDYgKzEwOSw3IEBACiAgICAgICAgIHJhdGlvID0gMDsKICAgICAg ICAga2VlcFJhdGlvID0gZmFsc2U7CiAgICAgICAgIG1vdXNlU2VsZWN0ZWRPYmplY3QgPSBmYWxz ZTsKKyAgICAgICAgc2VsZWN0ZWRPYmplY3ROdW1iZXIgPSAtMTsKICAgICB9IGVsc2UgewogICAg ICAgICB2aWV3ID0gMDsKICAgICAgICAgaGlkZSgpOwpAQCAtMzY1LDYgKzM2Niw3IEBACiAgICAg ICAgICAgICAgICAgICAgIGlmICggb3Zlck9iamVjdCApIHsKICAgICAgICAgICAgICAgICAgICAg ICAgIHNlbGVjdE9iaigga3BvYmplY3QgKTsKICAgICAgICAgICAgICAgICAgICAgICAgIG1vZFR5 cGUgPSBNVF9OT05FOworICAgICAgICAgICAgICAgICAgICAgICAgcmFpc2VPYmplY3QoKTsKICAg ICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgICAgIG1vZFR5 cGUgPSBNVF9OT05FOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKCAhKCBlLT5zdGF0ZSgp ICYgU2hpZnRCdXR0b24gKSAmJiAhKCBlLT5zdGF0ZSgpICYgQ29udHJvbEJ1dHRvbiApICkKQEAg LTEyOTQsNiArMTI5NiwxMyBAQAogICAgIGlmKHZpZXctPmtQcmVzZW50ZXJEb2MoKS0+bnVtU2Vs ZWN0ZWQoKT09MCkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKCAhdmlldy0+a1ByZXNlbnRl ckRvYygpLT5yYWlzZUFuZExvd2VyT2JqZWN0ICYmIHNlbGVjdGVkT2JqZWN0TnVtYmVyICE9IC0x ICkgeworICAgICAgICBsb3dlck9iamVjdCgpOworICAgICAgICBzZWxlY3RlZE9iamVjdE51bWJl ciA9IC0xOworICAgIH0KKyAgICBlbHNlCisgICAgICAgIHZpZXctPmtQcmVzZW50ZXJEb2MoKS0+ cmFpc2VBbmRMb3dlck9iamVjdCA9IGZhbHNlOworCiAgICAgS1BPYmplY3QgKmtwb2JqZWN0Owog CiAgICAgZm9yICggaW50IGkgPSAwOyBpIDwgc3RhdGljX2Nhc3Q8aW50Piggb2JqZWN0TGlzdCgp LT5jb3VudCgpICk7IGkrKyApCkBAIC00MzU1LDYgKzQzNjQsNTggQEAKICAgICBfcmVwYWludCgg a3BvYmplY3QgKTsKIAogICAgIG9sZEJvdW5kaW5nUmVjdCA9IGtwb2JqZWN0LT5nZXRCb3VuZGlu Z1JlY3QoIDAsIDAgKTsKK30KKwordm9pZCBQYWdlOjpyYWlzZU9iamVjdCgpCit7CisgICAgaWYg KCBzZWxlY3RlZE9iamVjdE51bWJlciA9PSAtMSApIHsKKyAgICAgICAgS1BPYmplY3QgKmtwb2Jq ZWN0ID0gMDsKKworICAgICAgICBpZiAoIG9ubHlPbmVTZWxlY3RlZE9iamVjdCgpICkgeyAvLyBl eGVjdXRlIHRoaXMgaWYgdXNlciBzZWxlY3RlZCBpcyBvbmUgb2JqZWN0LgorICAgICAgICAgICAg Zm9yICggdWludCBpID0gMDsgaSA8IG9iamVjdExpc3QoKS0+Y291bnQoKTsgKytpICkgeworICAg ICAgICAgICAgICAgIGtwb2JqZWN0ID0gb2JqZWN0TGlzdCgpLT5hdCggaSApOworICAgICAgICAg ICAgICAgIGlmICgga3BvYmplY3QtPmlzU2VsZWN0ZWQoKSApIHsKKyAgICAgICAgICAgICAgICAg ICAgb2JqZWN0TGlzdCgpLT5yZW1vdmUoIGkgKTsKKyAgICAgICAgICAgICAgICAgICAgb2JqZWN0 TGlzdCgpLT5hcHBlbmQoIGtwb2JqZWN0ICk7CisgICAgICAgICAgICAgICAgICAgIHNlbGVjdGVk T2JqZWN0TnVtYmVyID0gaTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIGVsc2UKKyAgICAgICAg ICAgIHNlbGVjdGVkT2JqZWN0TnVtYmVyID0gLTE7CisgICAgfQorfQorCit2b2lkIFBhZ2U6Omxv d2VyT2JqZWN0KCkKK3sKKyAgICBLUE9iamVjdCAqa3BvYmplY3QgPSAwOworCisgICAgZm9yICgg dWludCBpID0gMDsgaSA8IG9iamVjdExpc3QoKS0+Y291bnQoKTsgKytpICkgeworICAgICAgICBr cG9iamVjdCA9IG9iamVjdExpc3QoKS0+YXQoIGkgKTsKKyAgICAgICAgaWYgKCBrcG9iamVjdC0+ aXNTZWxlY3RlZCgpICkgeworICAgICAgICAgICAgb2JqZWN0TGlzdCgpLT5yZW1vdmUoIGkgKTsK KyAgICAgICAgICAgIG9iamVjdExpc3QoKS0+aW5zZXJ0KCBzZWxlY3RlZE9iamVjdE51bWJlciwg a3BvYmplY3QgKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorfQorCiti b29sIFBhZ2U6Om9ubHlPbmVTZWxlY3RlZE9iamVjdCgpCit7CisgICAgS1BPYmplY3QgKmtwb2Jq ZWN0ID0gMDsKKyAgICBpbnQgaiA9IDA7CisgICAgLy8gRXhhbWluZSBudW1iZXIgb2YgdGhlIG9i amVjdCB3aGljaCB1c2VyIHNlbGVjdGVkLgorICAgIGZvciAoIHVpbnQgaSA9IDA7IGkgPCBvYmpl Y3RMaXN0KCktPmNvdW50KCk7ICsraSApIHsKKyAgICAgICAga3BvYmplY3QgPSBvYmplY3RMaXN0 KCktPmF0KCBpICk7CisgICAgICAgIGlmICgga3BvYmplY3QtPmlzU2VsZWN0ZWQoKSApIHsKKyAg ICAgICAgICAgICsrajsKKyAgICAgICAgICAgIGlmICggaiA+IDEgKQorICAgICAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiB0cnVlOwogfQog CiAjaW5jbHVkZSA8cGFnZS5tb2M+CmRpZmYgLXVyIGtvZmZpY2Uub3JpZy9rcHJlc2VudGVyL3Bh Z2UuaCBrb2ZmaWNlL2twcmVzZW50ZXIvcGFnZS5oCi0tLSBrb2ZmaWNlLm9yaWcva3ByZXNlbnRl ci9wYWdlLmgJTW9uIEp1biAyNSAxODo0MTo1MyAyMDAxCisrKyBrb2ZmaWNlL2twcmVzZW50ZXIv cGFnZS5oCU1vbiBKdW4gMjUgMTg6NDk6NDQgMjAwMQpAQCAtMTMwLDYgKzEzMCw4IEBACiAKICAg ICB2b2lkIHNldE1vdXNlU2VsZWN0ZWRPYmplY3QoYm9vbCBiKTsKIAorICAgIGJvb2wgb25seU9u ZVNlbGVjdGVkT2JqZWN0KCk7CisKIHB1YmxpYyBzbG90czoKICAgICB2b2lkIGV4aXRFZGl0TW9k ZSgpOwogCkBAIC0yNjcsNiArMjY5LDEwIEBACiAKICAgICB2b2lkIG1vdmVPYmplY3QoIGludCB4 LCBpbnQgeSwgYm9vbCBrZXkgKTsKICAgICB2b2lkIHJlc2l6ZU9iamVjdCgpOworCisgICAgdm9p ZCByYWlzZU9iamVjdCgpOworICAgIHZvaWQgbG93ZXJPYmplY3QoKTsKKyAgICBpbnQgc2VsZWN0 ZWRPYmplY3ROdW1iZXI7CiAKIHB1YmxpYyBzbG90czoKICAgICB2b2lkIGNoUGljKCk7Cg== --------------Boundary-00=_0UDHUG9D5S1232HA1OBB-- _______________________________________________ Koffice-devel mailing list Koffice-devel@master.kde.org http://master.kde.org/mailman/listinfo/koffice-devel