diff options
| author | culler <culler> | 2020-10-07 22:12:07 (GMT) |
|---|---|---|
| committer | culler <culler> | 2020-10-07 22:12:07 (GMT) |
| commit | f13aa6c87705fae7111ee41caa62cddd5b99f3e0 (patch) | |
| tree | 02d62b06a46152820afd8492bcdb966852f4506a | |
| parent | 5450612a4d1bd4e6f796f76f12f3d216dfc935ba (diff) | |
| parent | 0cb39e5622b69bc7c253b56461bc6c94076f1ccd (diff) | |
| download | tk-f13aa6c87705fae7111ee41caa62cddd5b99f3e0.zip tk-f13aa6c87705fae7111ee41caa62cddd5b99f3e0.tar.gz tk-f13aa6c87705fae7111ee41caa62cddd5b99f3e0.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | doc/ttk_combobox.n | 2 | ||||
| -rw-r--r-- | doc/ttk_entry.n | 2 | ||||
| -rw-r--r-- | doc/ttk_spinbox.n | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 9 |
5 files changed, 18 insertions, 3 deletions
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n index 3ece362..ec61428 100644 --- a/doc/ttk_combobox.n +++ b/doc/ttk_combobox.n @@ -142,6 +142,8 @@ are: .RS Can only be changed when using non-native and non-graphical themes. .RE +\fB\-insertcolor\fP \fIcolor\fP +.br \fB\-insertwidth\fP \fIamount\fP .br \fB\-lightcolor\fP \fIcolor\fP diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n index 62b9951..9a2d429 100644 --- a/doc/ttk_entry.n +++ b/doc/ttk_entry.n @@ -448,6 +448,8 @@ Some themes use a graphical background and their field background colors cannot .RE \fB\-foreground\fP \fIcolor\fP .br +\fB\-insertcolor\fP \fIcolor\fP +.br \fB\-insertwidth\fP \fIamount\fP .br \fB\-lightcolor\fP \fIcolor\fP diff --git a/doc/ttk_spinbox.n b/doc/ttk_spinbox.n index b8f3ca2..49dc8ff 100644 --- a/doc/ttk_spinbox.n +++ b/doc/ttk_spinbox.n @@ -107,6 +107,10 @@ value is specified for \fB\-fieldbackground\fP. Otherwise it is ignored. .br \fB\-foreground\fP \fIcolor\fP .br +\fB\-insertcolor\fP \fIcolor\fP +.br +\fB\-insertwidth\fP \fIamount\fP +.br \fB\-lightcolor\fP \fIcolor\fP .br \fB\-padding\fP \fIpadding\fP diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index f65f3ca..d2979f6 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -369,7 +369,7 @@ XResizeWindow( r.origin.y += r.size.height - height; r.size.width = width; r.size.height = height; - [w setFrame:[w frameRectForContentRect:r] display:YES]; + [w setFrame:[w frameRectForContentRect:r] display:NO]; } } } else { @@ -426,7 +426,7 @@ XMoveResizeWindow( X + XOff, TkMacOSXZeroScreenHeight() - Y - YOff - Height, Width, Height); - [w setFrame:[w frameRectForContentRect:r] display:YES]; + [w setFrame:[w frameRectForContentRect:r] display:NO]; } } else { MoveResizeWindow(macWin); diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 98bec7d..f60eb75 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -970,6 +970,14 @@ ConfigureRestrictProc( TkWindow *winPtr = TkMacOSXGetTkWindow(w); Tk_Window tkwin = (Tk_Window)winPtr; + /* + * See ticket [1fa8c3ed8d]. This may not be needed for macOSX 11. + */ + + if(![NSApp isDrawing]) { + return; + } + if (![self inLiveResize] && [w respondsToSelector: @selector (tkLayoutChanged)]) { [(TKWindow *)w tkLayoutChanged]; @@ -1017,7 +1025,6 @@ ConfigureRestrictProc( */ [self generateExposeEvents: [self bounds]]; - [w displayIfNeeded]; /* * Finally, unlock the main autoreleasePool. |