Skip to content

Backported panedwindow bugfixes #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrstphrchvz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Backported panedwindow bugfixes #82

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
992bf5f
tkPanedWindow.c: backport 1.13.2.5
chrstphrchvz Apr 5, 2021
c5da515
tkPanedWindow.c: backport 1.13.2.6
chrstphrchvz Apr 5, 2021
04dfdb4
tkPanedWindow.c: backport 1.13.2.7
chrstphrchvz Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions pTk/mTk/generic/tkPanedWindow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
* RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.4 2003/08/19 21:00:13 jenglish Exp $
* RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.7 2004/11/17 22:18:07 hobbs Exp $
*/

#include "tkPort.h"
Expand Down Expand Up @@ -252,7 +252,7 @@ static Tk_OptionSpec optionSpecs[] = {
TK_OPTION_NULL_OK, 0, 0},
{TK_OPTION_PIXELS, "-handlepad", "handlePad", "HandlePad",
DEF_PANEDWINDOW_HANDLEPAD, -1, Tk_Offset(PanedWindow, handlePad),
0, 0},
0, 0, GEOMETRY},
{TK_OPTION_PIXELS, "-handlesize", "handleSize", "HandleSize",
DEF_PANEDWINDOW_HANDLESIZE, Tk_Offset(PanedWindow, handleSizePtr),
Tk_Offset(PanedWindow, handleSize), 0, 0, GEOMETRY},
Expand Down Expand Up @@ -341,6 +341,7 @@ Tk_PanedWindowObjCmd(clientData, interp, objc, objv)
PanedWindow *pwPtr;
Tk_Window tkwin, parent;
OptionTables *pwOpts;
XSetWindowAttributes atts;

if (objc < 2) {
Tcl_WrongNumArgs(interp, 1, objv, "pathName ?options?");
Expand Down Expand Up @@ -429,11 +430,15 @@ Tk_PanedWindowObjCmd(clientData, interp, objc, objv)
* panedwindow despite being children of windows with potentially
* different characteristics, and it looks better that way too.
* [Bug 702230]
* Also Set the X window save under attribute to avoid expose events as
* the proxy sash is dragged across the panes. [Bug 1036963]
*/
Tk_SetWindowVisual(pwPtr->proxywin,
Tk_Visual(tkwin), Tk_Depth(tkwin), Tk_Colormap(tkwin));
Tk_CreateEventHandler(pwPtr->proxywin, ExposureMask, ProxyWindowEventProc,
(ClientData) pwPtr);
atts.save_under = True;
Tk_ChangeWindowAttributes(pwPtr->proxywin, CWSaveUnder, &atts);

if (ConfigurePanedWindow(interp, pwPtr, objc - 2, objv + 2) != TCL_OK) {
Tk_DestroyWindow(pwPtr->proxywin);
Expand Down Expand Up @@ -1748,6 +1753,18 @@ Unlink(slavePtr)
}
}

/*
* Clean out any -after or -before references to this slave
*/
for (i = 0; i < masterPtr->numSlaves; i++) {
if (masterPtr->slaves[i]->before == slavePtr->tkwin) {
masterPtr->slaves[i]->before = None;
}
if (masterPtr->slaves[i]->after == slavePtr->tkwin) {
masterPtr->slaves[i]->after = None;
}
}

masterPtr->flags |= REQUESTED_RELAYOUT;
if (!(masterPtr->flags & REDRAW_PENDING)) {
masterPtr->flags |= REDRAW_PENDING;
Expand Down