diff options
-rw-r--r-- | doc/ttk_button.n | 1 | ||||
-rw-r--r-- | doc/ttk_frame.n | 6 | ||||
-rw-r--r-- | doc/ttk_image.n | 20 | ||||
-rw-r--r-- | doc/ttk_label.n | 10 | ||||
-rw-r--r-- | doc/ttk_labelframe.n | 6 | ||||
-rw-r--r-- | doc/ttk_notebook.n | 3 | ||||
-rw-r--r-- | doc/ttk_treeview.n | 5 | ||||
-rw-r--r-- | doc/ttk_vsapi.n | 7 | ||||
-rw-r--r-- | doc/ttk_widget.n | 11 |
9 files changed, 45 insertions, 24 deletions
diff --git a/doc/ttk_button.n b/doc/ttk_button.n index f76de6c..78f73a4 100644 --- a/doc/ttk_button.n +++ b/doc/ttk_button.n @@ -44,7 +44,6 @@ with an extra highlight ring, or with a different border color. .\" .OP \-foreground foreground Foreground .\" .OP \-font font Font .\" .OP \-anchor anchor Anchor -.\" .OP \-padding padding Padding .\" .OP \-relief relief Relief .SH "WIDGET COMMAND" .PP diff --git a/doc/ttk_frame.n b/doc/ttk_frame.n index b54ce96..d2bd745 100644 --- a/doc/ttk_frame.n +++ b/doc/ttk_frame.n @@ -17,8 +17,8 @@ ttk::frame \- Simple container widget A \fBttk::frame\fR widget is a container, used to group other widgets together. .SO ttk_widget -\-class \-cursor \-takefocus -\-style +\-class \-cursor \-padding \-style +\-takefocus .SE .SH "WIDGET-SPECIFIC OPTIONS" .OP \-borderwidth borderWidth BorderWidth @@ -28,8 +28,6 @@ One of the standard Tk border styles: \fBflat\fR, \fBgroove\fR, \fBraised\fR, \fBridge\fR, \fBsolid\fR, or \fBsunken\fR. Defaults to \fBflat\fR. -.OP \-padding padding Padding -Additional padding to include inside the border. .OP \-width width Width If specified, the widget's requested width in pixels. .OP \-height height Height diff --git a/doc/ttk_image.n b/doc/ttk_image.n index 4985c20..bc1dd3f 100644 --- a/doc/ttk_image.n +++ b/doc/ttk_image.n @@ -29,6 +29,13 @@ Valid \fIoptions\fR are: \fB\-border\fR \fIpadding\fR \fIpadding\fR is a list of up to four integers, specifying the left, top, right, and bottom borders, respectively. +If fewer than four elements are specified, +\fIbottom\fR defaults to \fItop\fR, +\fIright\fR defaults to \fIleft\fR, and +\fItop\fR defaults to \fIleft\fR. +In other words, a list of three numbers specify the left, vertical, and right border; +a list of two numbers specify the horizontal and the vertical border; +a single number specifies the same border all the way around the element. See \fBIMAGE STRETCHING\fR, below. .TP \fB\-height \fIheight\fR @@ -36,8 +43,17 @@ Specifies a minimum height for the element. If less than zero, the base image's height is used as a default. .TP \fB\-padding\fR \fIpadding\fR -Specifies the element's interior padding. Defaults to -\fB\-border\fR if not specified. +Specifies the element's interior padding. +The padding is a list of up to four length specifications +\fIleft top right bottom\fR. +If fewer than four elements are specified, +\fIbottom\fR defaults to \fItop\fR, +\fIright\fR defaults to \fIleft\fR, and +\fItop\fR defaults to \fIleft\fR. +In other words, a list of three numbers specify the left, vertical, and right padding; +a list of two numbers specify the horizontal and the vertical padding; +a single number specifies the same padding all the way around the widget. +Defaults to \fB\-border\fR if not specified. .TP \fB\-sticky\fR \fIspec\fR Specifies how the image is placed within the final parcel. diff --git a/doc/ttk_label.n b/doc/ttk_label.n index c11240f..5752c3c 100644 --- a/doc/ttk_label.n +++ b/doc/ttk_label.n @@ -20,7 +20,7 @@ to automatically change the displayed text. .SO ttk_widget \-anchor \-class \-compound \-cursor \-font \-foreground -\-image \-justify \-style \-takefocus +\-image \-justify \-padding \-style \-takefocus \-text \-textvariable \-underline \-width \-wraplength .SE @@ -28,14 +28,6 @@ to automatically change the displayed text. .OP \-background frameColor FrameColor The widget's background color. If unspecified, the theme default is used. -.OP \-padding padding Padding -Specifies the amount of extra space to allocate for the widget. -The padding is a list of up to four length specifications -\fIleft top right bottom\fR. -If fewer than four elements are specified, -\fIbottom\fR defaults to \fItop\fR, -\fIright\fR defaults to \fIleft\fR, and -\fItop\fR defaults to \fIleft\fR. .OP \-relief relief Relief .\" Rewrite this: Specifies the 3-D effect desired for the widget border. diff --git a/doc/ttk_labelframe.n b/doc/ttk_labelframe.n index 64edf6a..4c2c8d5 100644 --- a/doc/ttk_labelframe.n +++ b/doc/ttk_labelframe.n @@ -18,8 +18,8 @@ A \fBttk::labelframe\fR widget is a container used to group other widgets together. It has an optional label, which may be a plain text string or another widget. .SO ttk_widget -\-class \-cursor \-takefocus -\-style +\-class \-cursor \-padding \-style +\-takefocus .SE .SH "WIDGET-SPECIFIC OPTIONS" .\" XXX: Currently included, but may go away: @@ -48,8 +48,6 @@ underline in the text string. The underlined character is used for mnemonic activation. Mnemonic activation for a \fBttk::labelframe\fR sets the keyboard focus to the first child of the \fBttk::labelframe\fR widget. -.OP \-padding padding Padding -Additional padding to include inside the border. .OP \-labelwidget labelWidget LabelWidget The name of a widget to use for the label. If set, overrides the \fB\-text\fR option. diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n index 290a0c7..e2ae137 100644 --- a/doc/ttk_notebook.n +++ b/doc/ttk_notebook.n @@ -41,6 +41,9 @@ If fewer than four elements are specified, \fIbottom\fR defaults to \fItop\fR, \fIright\fR defaults to \fIleft\fR, and \fItop\fR defaults to \fIleft\fR. +In other words, a list of three numbers specify the left, vertical, and right padding; +a list of two numbers specify the horizontal and the vertical padding; +a single number specifies the same padding all the way around the widget. .OP \-width width Width If present and greater than zero, specifies the desired width of the pane area diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n index 660b076..8399a09 100644 --- a/doc/ttk_treeview.n +++ b/doc/ttk_treeview.n @@ -45,6 +45,7 @@ and [\fBxy\fR]\fBview\fR widget commands. .SO ttk_widget \-class \-cursor \-takefocus \-style \-xscrollcommand \-yscrollcommand +\-padding .SE .SH "WIDGET-SPECIFIC OPTIONS" .OP \-columns columns Columns @@ -63,10 +64,6 @@ all columns are shown in the order given. Specifies the number of rows which should be visible. Note: the requested width is determined from the sum of the column widths. -.OP \-padding padding Padding -Specifies the internal padding for the widget. -The padding is a list of up to four length specifications; -see \fBTtk_GetPaddingFromObj()\fR for details. .OP \-selectmode selectMode SelectMode Controls how the built-in class bindings manage the selection. One of \fBextended\fR, \fBbrowse\fR, or \fBnone\fR. diff --git a/doc/ttk_vsapi.n b/doc/ttk_vsapi.n index 4d5c3eb..af63c39 100644 --- a/doc/ttk_vsapi.n +++ b/doc/ttk_vsapi.n @@ -34,6 +34,13 @@ Valid \fIoptions\fR are: Specify the element's interior padding. \fIpadding\fR is a list of up to four integers specifying the left, top, right and bottom padding quantities respectively. +If fewer than four elements are specified, +\fIbottom\fR defaults to \fItop\fR, +\fIright\fR defaults to \fIleft\fR, and +\fItop\fR defaults to \fIleft\fR. +In other words, a list of three numbers specify the left, vertical, and right padding; +a list of two numbers specify the horizontal and the vertical padding; +a single number specifies the same padding all the way around the widget. This option may not be mixed with any other options. .TP \fB\-margins \fIpadding\fR diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n index d2916f1..8a0b275 100644 --- a/doc/ttk_widget.n +++ b/doc/ttk_widget.n @@ -114,6 +114,17 @@ If there are multiple lines of text, specifies how the lines are laid out relative to one another. One of \fBleft\fR, \fBcenter\fR, or \fBright\fR. See also \fB\-anchor\fR (for widgets supporting this option). +.OP \-padding padding Padding +Specifies the internal padding for the widget. +The padding is a list of up to four length specifications +\fIleft top right bottom\fR. +If fewer than four elements are specified, +\fIbottom\fR defaults to \fItop\fR, +\fIright\fR defaults to \fIleft\fR, and +\fItop\fR defaults to \fIleft\fR. +In other words, a list of three numbers specify the left, vertical, and right padding; +a list of two numbers specify the horizontal and the vertical padding; +a single number specifies the same padding all the way around the widget. .OP \-text text Text Specifies a text string to be displayed inside the widget (unless overridden by \fB\-textvariable\fR for the widgets supporting this option). |