diff --git a/.github/workflows/check_style.yml b/.github/workflows/check_style.yml index 4b69b1a39..876c44ebb 100644 --- a/.github/workflows/check_style.yml +++ b/.github/workflows/check_style.yml @@ -18,7 +18,7 @@ jobs: with: repository: szepeviktor/astyle path: astyle - ref: v3.4.10 + ref: v3.4.12 - name: Install astyle run: | cd astyle/build/gcc/ diff --git a/docs/overview/style-props.md b/docs/overview/style-props.md deleted file mode 100644 index 5b8e51b35..000000000 --- a/docs/overview/style-props.md +++ /dev/null @@ -1,1024 +0,0 @@ -# Style properties - -## Size and position -Properties related to size, position, alignment and layout of the objects. - -### width -Sets the width of object. Pixel, percentage and `LV_SIZE_CONTENT` values can be used. Percentage values are relative to the width of the parent's content area. - - -### min_width -Sets a minimal width. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. - - -### max_width -Sets a maximal width. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. - - -### height -Sets the height of object. Pixel, percentage and `LV_SIZE_CONTENT` can be used. Percentage values are relative to the height of the parent's content area. - - -### min_height -Sets a minimal height. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. - - -### max_height -Sets a maximal height. Pixel and percentage values can be used. Percentage values are relative to the height of the parent's content area. - - -### length -Its meaning depends on the type of the widget. For example in case of lv_scale it means the length of the ticks. - - -### x -Set the X coordinate of the object considering the set `align`. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. - - -### y -Set the Y coordinate of the object considering the set `align`. Pixel and percentage values can be used. Percentage values are relative to the height of the parent's content area. - - -### align -Set the alignment which tells from which point of the parent the X and Y coordinates should be interpreted. The possible values are: `LV_ALIGN_DEFAULT`, `LV_ALIGN_TOP_LEFT/MID/RIGHT`, `LV_ALIGN_BOTTOM_LEFT/MID/RIGHT`, `LV_ALIGN_LEFT/RIGHT_MID`, `LV_ALIGN_CENTER`. `LV_ALIGN_DEFAULT` means `LV_ALIGN_TOP_LEFT` with LTR base direction and `LV_ALIGN_TOP_RIGHT` with RTL base direction. - - -### transform_width -Make the object wider on both sides with this value. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's width. - - -### transform_height -Make the object higher on both sides with this value. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's height. - - -### translate_x -Move the object with this value in X direction. Applied after layouts, aligns and other positioning. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's width. - - -### translate_y -Move the object with this value in Y direction. Applied after layouts, aligns and other positioning. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's height. - - -### transform_scale_x -Zoom an objects horizontally. The value 256 (or `LV_SCALE_NONE`) means normal size, 128 half size, 512 double size, and so on - - -### transform_scale_y -Zoom an objects vertically. The value 256 (or `LV_SCALE_NONE`) means normal size, 128 half size, 512 double size, and so on - - -### transform_rotation -Rotate an objects. The value is interpreted in 0.1 degree units. E.g. 450 means 45 deg. - - -### transform_pivot_x -Set the pivot point's X coordinate for transformations. Relative to the object's top left corner' - - -### transform_pivot_y -Set the pivot point's Y coordinate for transformations. Relative to the object's top left corner' - - -### transform_skew_x -Skew an object horizontally. The value is interpreted in 0.1 degree units. E.g. 450 means 45 deg. - - -### transform_skew_y -Skew an object vertically. The value is interpreted in 0.1 degree units. E.g. 450 means 45 deg. - - -## Padding -Properties to describe spacing between the parent's sides and the children and among the children. Very similar to the padding properties in HTML. - -### pad_top -Sets the padding on the top. It makes the content area smaller in this direction. - - -### pad_bottom -Sets the padding on the bottom. It makes the content area smaller in this direction. - - -### pad_left -Sets the padding on the left. It makes the content area smaller in this direction. - - -### pad_right -Sets the padding on the right. It makes the content area smaller in this direction. - - -### pad_row -Sets the padding between the rows. Used by the layouts. - - -### pad_column -Sets the padding between the columns. Used by the layouts. - - -## Margin -Properties to describe spacing around an object. Very similar to the margin properties in HTML. - -### margin_top -Sets the margin on the top. The object will keep this space from its siblings in layouts. - - -### margin_bottom -Sets the margin on the bottom. The object will keep this space from its siblings in layouts. - - -### margin_left -Sets the margin on the left. The object will keep this space from its siblings in layouts. - - -### margin_right -Sets the margin on the right. The object will keep this space from its siblings in layouts. - - -## Background -Properties to describe the background color and image of the objects. - -### bg_color -Set the background color of the object. - - -### bg_opa -Set the opacity of the background. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### bg_grad_color -Set the gradient color of the background. Used only if `grad_dir` is not `LV_GRAD_DIR_NONE` - - -### bg_grad_dir -Set the direction of the gradient of the background. The possible values are `LV_GRAD_DIR_NONE/HOR/VER`. - - -### bg_main_stop -Set the point from which the background color should start for gradients. 0 means to top/left side, 255 the bottom/right side, 128 the center, and so on - - -### bg_grad_stop -Set the point from which the background's gradient color should start. 0 means to top/left side, 255 the bottom/right side, 128 the center, and so on - - -### bg_main_opa -Set the opacity of the first gradient color - - -### bg_grad_opa -Set the opacity of the second gradient color - - -### bg_grad -Set the gradient definition. The pointed instance must exist while the object is alive. NULL to disable. It wraps `BG_GRAD_COLOR`, `BG_GRAD_DIR`, `BG_MAIN_STOP` and `BG_GRAD_STOP` into one descriptor and allows creating gradients with more colors too. If it's set other gradient related properties will be ignored' - - -### bg_image_src -Set a background image. Can be a pointer to `lv_image_dsc_t`, a path to a file or an `LV_SYMBOL_...` - - -### bg_image_opa -Set the opacity of the background image. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### bg_image_recolor -Set a color to mix to the background image. - - -### bg_image_recolor_opa -Set the intensity of background image recoloring. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means no mixing, 255, `LV_OPA_100` or `LV_OPA_COVER` means full recoloring, other values or LV_OPA_10, LV_OPA_20, etc are interpreted proportionally. - - -### bg_image_tiled -If enabled the background image will be tiled. The possible values are `true` or `false`. - - -## Border -Properties to describe the borders - -### border_color -Set the color of the border - - -### border_opa -Set the opacity of the border. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### border_width -Set the width of the border. Only pixel values can be used. - - -### border_side -Set only which side(s) the border should be drawn. The possible values are `LV_BORDER_SIDE_NONE/TOP/BOTTOM/LEFT/RIGHT/INTERNAL`. OR-ed values can be used as well, e.g. `LV_BORDER_SIDE_TOP | LV_BORDER_SIDE_LEFT`. - - -### border_post -Sets whether the border should be drawn before or after the children are drawn. `true`: after children, `false`: before children - - -## Outline -Properties to describe the outline. It's like a border but drawn outside of the rectangles. - -### outline_width -Set the width of the outline in pixels. - - -### outline_color -Set the color of the outline. - - -### outline_opa -Set the opacity of the outline. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### outline_pad -Set the padding of the outline, i.e. the gap between object and the outline. - - -## Shadow -Properties to describe the shadow drawn under the rectangles. - -### shadow_width -Set the width of the shadow in pixels. The value should be >= 0. - - -### shadow_offset_x -Set an offset on the shadow in pixels in X direction. - - -### shadow_offset_y -Set an offset on the shadow in pixels in Y direction. - - -### shadow_spread -Make the shadow calculation to use a larger or smaller rectangle as base. The value can be in pixel to make the area larger/smaller - - -### shadow_color -Set the color of the shadow - - -### shadow_opa -Set the opacity of the shadow. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -## Image -Properties to describe the images - -### image_opa -Set the opacity of an image. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### image_recolor -Set color to mixt to the image. - - -### image_recolor_opa -Set the intensity of the color mixing. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -## Line -Properties to describe line-like objects - -### line_width -Set the width of the lines in pixel. - - -### line_dash_width -Set the width of dashes in pixel. Note that dash works only on horizontal and vertical lines - - -### line_dash_gap -Set the gap between dashes in pixel. Note that dash works only on horizontal and vertical lines - - -### line_rounded -Make the end points of the lines rounded. `true`: rounded, `false`: perpendicular line ending - - -### line_color -Set the color of the lines. - - -### line_opa -Set the opacity of the lines. - - -## Arc -TODO - -### arc_width -Set the width (thickness) of the arcs in pixel. - - -### arc_rounded -Make the end points of the arcs rounded. `true`: rounded, `false`: perpendicular line ending - - -### arc_color -Set the color of the arc. - - -### arc_opa -Set the opacity of the arcs. - - -### arc_image_src -Set an image from which the arc will be masked out. It's useful to display complex effects on the arcs. Can be a pointer to `lv_image_dsc_t` or a path to a file - - -## Text -Properties to describe the properties of text. All these properties are inherited. - -### text_color -Sets the color of the text. - - -### text_opa -Set the opacity of the text. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### text_font -Set the font of the text (a pointer `lv_font_t *`). - - -### text_letter_space -Set the letter space in pixels - - -### text_line_space -Set the line space in pixels. - - -### text_decor -Set decoration for the text. The possible values are `LV_TEXT_DECOR_NONE/UNDERLINE/STRIKETHROUGH`. OR-ed values can be used as well. - - -### text_align -Set how to align the lines of the text. Note that it doesn't align the object itself, only the lines inside the object. The possible values are `LV_TEXT_ALIGN_LEFT/CENTER/RIGHT/AUTO`. `LV_TEXT_ALIGN_AUTO` detect the text base direction and uses left or right alignment accordingly - - -## Miscellaneous -Mixed properties for various purposes. - -### radius -Set the radius on every corner. The value is interpreted in pixel (>= 0) or `LV_RADIUS_CIRCLE` for max. radius - - -### clip_corner -Enable to clip the overflowed content on the rounded corner. Can be `true` or `false`. - - -### opa -Scale down all opacity values of the object by this factor. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### opa_layered -First draw the object on the layer, then scale down layer opacity factor. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. - - -### color_filter_dsc -Mix a color to all colors of the object. - - -### color_filter_opa -The intensity of mixing of color filter. - - -### anim -The animation template for the object's animation. Should be a pointer to `lv_anim_t`. The animation parameters are widget specific, e.g. animation time could be the E.g. blink time of the cursor on the text area or scroll time of a roller. See the widgets' documentation to learn more. - - -### anim_duration -The animation duration in milliseconds. Its meaning is widget specific. E.g. blink time of the cursor on the text area or scroll time of a roller. See the widgets' documentation to learn more. - - -### transition -An initialized `lv_style_transition_dsc_t` to describe a transition. - - -### blend_mode -Describes how to blend the colors to the background. The possible values are `LV_BLEND_MODE_NORMAL/ADDITIVE/SUBTRACTIVE/MULTIPLY` - - -### layout -Set the layout if the object. The children will be repositioned and resized according to the policies set for the layout. For the possible values see the documentation of the layouts. - - -### base_dir -Set the base direction of the object. The possible values are `LV_BIDI_DIR_LTR/RTL/AUTO`. - - -### bitmap_mask_src -If set a layer will be created for the widget and the layer will be masked with this A8 bitmap mask. - - -## Flex -Flex layout properties. - -### flex_flow -Defines in which direct the flex layout should arrange the children - - -### flex_main_place -Defines how to align the children in the direction of flex flow - - -### flex_cross_place -Defines how to align the children perpendicular to the direction of flex flow - - -### flex_track_place -Defines how to align the tracks of the flow - - -### flex_grow -Defines how mayn space to take proprtionally the free space of the object's trach - - -## Grid -Grid layout properties. - -### grid_column_dsc_array -An array to describe the columns of the grid. Should be LV_GRID_TEMPLATE_LAST terminated - - -### grid_column_align -Defines how to distribute the columns - - -### grid_row_dsc_array -An array to describe the rows of the grid. Should be LV_GRID_TEMPLATE_LAST terminated - - -### grid_row_align -Defines how to distribute the rows. - - -### grid_cell_column_pos -Set the column in which the object should be placed - - -### grid_cell_x_align -Set how to align the object horizontally. - - -### grid_cell_column_span -Set how many columns the object should span. Needs to be >= 1 - - -### grid_cell_row_pos -Set the row in which the object should be placed - - -### grid_cell_y_align -Set how to align the object vertically. - - -### grid_cell_row_span -Set how many rows the object should span. Needs to be >= 1 - diff --git a/docs/overview/style-props.rst b/docs/overview/style-props.rst index 431cc6392..f0aacd718 100644 --- a/docs/overview/style-props.rst +++ b/docs/overview/style-props.rst @@ -1,5 +1,3 @@ -.. _style_properties: - ================ Style properties ================ @@ -7,1179 +5,362 @@ Style properties Size and position ----------------- -Properties related to size, position, alignment and layout of the -objects. +Properties related to size, position, alignment and layout of the objects. width ~~~~~ -Sets the width of object. Pixel, percentage and :c:macro:`LV_SIZE_CONTENT` -values can be used. Percentage values are relative to the width of the -parent's content area. +Sets the width of object. Pixel, percentage and `LV_SIZE_CONTENT` values can be used. Percentage values are relative to the width of the parent's content area. .. raw:: html - + min_width ~~~~~~~~~ -Sets a minimal width. Pixel and percentage values can be used. -Percentage values are relative to the width of the parent's content -area. +Sets a minimal width. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. .. raw:: html - + max_width ~~~~~~~~~ -Sets a maximal width. Pixel and percentage values can be used. -Percentage values are relative to the width of the parent's content -area. +Sets a maximal width. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. .. raw:: html - + height ~~~~~~ -Sets the height of object. Pixel, percentage and :c:macro:`LV_SIZE_CONTENT` can -be used. Percentage values are relative to the height of the parent's -content area. +Sets the height of object. Pixel, percentage and `LV_SIZE_CONTENT` can be used. Percentage values are relative to the height of the parent's content area. .. raw:: html - + min_height ~~~~~~~~~~ -Sets a minimal height. Pixel and percentage values can be used. -Percentage values are relative to the width of the parent's content -area. +Sets a minimal height. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. .. raw:: html - + max_height ~~~~~~~~~~ -Sets a maximal height. Pixel and percentage values can be used. -Percentage values are relative to the height of the parent's content -area. +Sets a maximal height. Pixel and percentage values can be used. Percentage values are relative to the height of the parent's content area. .. raw:: html - + x ~ -Set the X coordinate of the object considering the set ``align``. Pixel -and percentage values can be used. Percentage values are relative to the -width of the parent's content area. +Set the X coordinate of the object considering the set `align`. Pixel and percentage values can be used. Percentage values are relative to the width of the parent's content area. .. raw:: html - + y ~ -Set the Y coordinate of the object considering the set ``align``. Pixel -and percentage values can be used. Percentage values are relative to the -height of the parent's content area. +Set the Y coordinate of the object considering the set `align`. Pixel and percentage values can be used. Percentage values are relative to the height of the parent's content area. .. raw:: html - + align ~~~~~ -Set the alignment which tells from which point of the parent the X and Y -coordinates should be interpreted. The possible values are: - -- :cpp:enumerator:`LV_ALIGN_DEFAULT`, -- :cpp:enumerator:`LV_ALIGN_TOP_LEFT` -- :cpp:enumerator:`LV_ALIGN_TOP_MID` -- :cpp:enumerator:`LV_ALIGN_TOP_RIGHT`, -- :cpp:enumerator:`LV_ALIGN_BOTTOM_LEFT` -- :cpp:enumerator:`LV_ALIGN_BOTTOM_MID` -- :cpp:enumerator:`LV_ALIGN_BOTTOM_RIGHT`, -- :cpp:enumerator:`LV_ALIGN_LEFT_MID` -- :cpp:enumerator:`LV_ALIGN_RIGHT_MID`, -- :cpp:enumerator:`LV_ALIGN_CENTER`. -- :cpp:enumerator:`LV_ALIGN_DEFAULT` - -:cpp:enumerator:`LV_ALIGN_DEFAULT` means :cpp:enumerator:`LV_ALIGN_TOP_LEFT` -with LTR base direction and :cpp:enumerator:`LV_ALIGN_TOP_RIGHT` with RTL base -direction. +Set the alignment which tells from which point of the parent the X and Y coordinates should be interpreted. The possible values are: `LV_ALIGN_DEFAULT`, `LV_ALIGN_TOP_LEFT/MID/RIGHT`, `LV_ALIGN_BOTTOM_LEFT/MID/RIGHT`, `LV_ALIGN_LEFT/RIGHT_MID`, `LV_ALIGN_CENTER`. `LV_ALIGN_DEFAULT` means `LV_ALIGN_TOP_LEFT` with LTR base direction and `LV_ALIGN_TOP_RIGHT` with RTL base direction. .. raw:: html - + transform_width ~~~~~~~~~~~~~~~ -Make the object wider on both sides with this value. Pixel and -percentage (with :cpp:expr:`lv_pct(x)`) values can be used. Percentage values -are relative to the object's width. +Make the object wider on both sides with this value. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's width. .. raw:: html - + transform_height ~~~~~~~~~~~~~~~~ -Make the object higher on both sides with this value. Pixel and -percentage (with :cpp:expr:`lv_pct(x)`) values can be used. Percentage values -are relative to the object's height. +Make the object higher on both sides with this value. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's height. .. raw:: html - + translate_x ~~~~~~~~~~~ -Move the object with this value in X direction. Applied after layouts, -aligns and other positioning. Pixel and percentage (with :cpp:expr:`lv_pct(x)`) -values can be used. Percentage values are relative to the object's -width. +Move the object with this value in X direction. Applied after layouts, aligns and other positioning. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's width. .. raw:: html - + translate_y ~~~~~~~~~~~ -Move the object with this value in Y direction. Applied after layouts, -aligns and other positioning. Pixel and percentage (with :cpp:expr:`lv_pct(x)`) -values can be used. Percentage values are relative to the object's -height. +Move the object with this value in Y direction. Applied after layouts, aligns and other positioning. Pixel and percentage (with `lv_pct(x)`) values can be used. Percentage values are relative to the object's height. .. raw:: html - - -transform_zoom -~~~~~~~~~~~~~~ - -Zoom an objects. The value 256 (or :cpp:enumerator:`LV_ZOOM_NONE`) means normal size, -128 half size, 512 double size, and so on - -.. raw:: html - - - -transform_angle -~~~~~~~~~~~~~~~ - -Rotate an objects. The value is interpreted in 0.1 degree units. E.g. -450 means 45 deg. - -.. raw:: html - - + transform_pivot_x ~~~~~~~~~~~~~~~~~ -Set the pivot point's X coordinate for transformations. Relative to the -object's top left corner' +Set the pivot point's X coordinate for transformations. Relative to the object's top left corner' .. raw:: html - + transform_pivot_y ~~~~~~~~~~~~~~~~~ -Set the pivot point's Y coordinate for transformations. Relative to the -object's top left corner' +Set the pivot point's Y coordinate for transformations. Relative to the object's top left corner' .. raw:: html - + Padding ------- -Properties to describe spacing between the parent's sides and the -children and among the children. Very similar to the padding properties -in HTML. +Properties to describe spacing between the parent's sides and the children and among the children. Very similar to the padding properties in HTML. pad_top ~~~~~~~ -Sets the padding on the top. It makes the content area smaller in this -direction. +Sets the padding on the top. It makes the content area smaller in this direction. .. raw:: html - + pad_bottom ~~~~~~~~~~ -Sets the padding on the bottom. It makes the content area smaller in -this direction. +Sets the padding on the bottom. It makes the content area smaller in this direction. .. raw:: html - + pad_left ~~~~~~~~ -Sets the padding on the left. It makes the content area smaller in this -direction. +Sets the padding on the left. It makes the content area smaller in this direction. .. raw:: html - + pad_right ~~~~~~~~~ -Sets the padding on the right. It makes the content area smaller in this -direction. +Sets the padding on the right. It makes the content area smaller in this direction. .. raw:: html - + pad_row ~~~~~~~ @@ -1188,51 +369,12 @@ Sets the padding between the rows. Used by the layouts. .. raw:: html - + pad_column ~~~~~~~~~~ @@ -1241,273 +383,73 @@ Sets the padding between the columns. Used by the layouts. .. raw:: html - + Margin ------ -Properties to describe spacing around an object. Very similar to the -margin properties in HTML. +Properties to describe spacing around an object. Very similar to the margin properties in HTML. margin_top ~~~~~~~~~~ -Sets the margin on the top. The object will keep this space from its -siblings in layouts. +Sets the margin on the top. The object will keep this space from its siblings in layouts. .. raw:: html - + margin_bottom ~~~~~~~~~~~~~ -Sets the margin on the bottom. The object will keep this space from its -siblings in layouts. +Sets the margin on the bottom. The object will keep this space from its siblings in layouts. .. raw:: html - + margin_left ~~~~~~~~~~~ -Sets the margin on the left. The object will keep this space from its -siblings in layouts. +Sets the margin on the left. The object will keep this space from its siblings in layouts. .. raw:: html - + margin_right ~~~~~~~~~~~~ -Sets the margin on the right. The object will keep this space from its -siblings in layouts. +Sets the margin on the right. The object will keep this space from its siblings in layouts. .. raw:: html - + Background ---------- @@ -1521,716 +463,194 @@ Set the background color of the object. .. raw:: html - + bg_opa ~~~~~~ -Set the opacity of the background. Value 0, :cpp:enumerator:`LV_OPA_0` or -:cpp:enumerator:`LV_OPA_TRANSP` means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or -:cpp:enumerator:`LV_OPA_COVER` means fully covering, other values or :cpp:enumerator:`LV_OPA_10`, -:cpp:enumerator:`LV_OPA_20`, etc means semi transparency. +Set the opacity of the background. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. .. raw:: html - + bg_grad_color ~~~~~~~~~~~~~ -Set the gradient color of the background. Used only if ``grad_dir`` is -not :cpp:enumerator:`LV_GRAD_DIR_NONE` +Set the gradient color of the background. Used only if `grad_dir` is not `LV_GRAD_DIR_NONE` .. raw:: html - + bg_grad_dir ~~~~~~~~~~~ -Set the direction of the gradient of the background. The possible values -are: - -- :cpp:enumerator:`LV_GRAD_DIR_NONE` -- :cpp:enumerator:`LV_GRAD_DIR_HOR` -- :cpp:enumerator:`LV_GRAD_DIR_VER` +Set the direction of the gradient of the background. The possible values are `LV_GRAD_DIR_NONE/HOR/VER`. .. raw:: html - + bg_main_stop ~~~~~~~~~~~~ -Set the point from which the background color should start for -gradients. 0 means to top/left side, 255 the bottom/right side, 128 the -center, and so on +Set the point from which the background color should start for gradients. 0 means to top/left side, 255 the bottom/right side, 128 the center, and so on .. raw:: html - + bg_grad_stop ~~~~~~~~~~~~ -Set the point from which the background's gradient color should start. 0 -means to top/left side, 255 the bottom/right side, 128 the center, and -so on +Set the point from which the background's gradient color should start. 0 means to top/left side, 255 the bottom/right side, 128 the center, and so on .. raw:: html - + bg_grad ~~~~~~~ -Set the gradient definition. The pointed instance must exist while the -object is alive. ``NULL`` to disable. It wraps :cpp:enumerator:`BG_GRAD_COLOR`, -:cpp:enumerator:`BG_GRAD_DIR`, :cpp:enumerator:`BG_MAIN_STOP` and :cpp:enumerator:`BG_GRAD_STOP` into one -descriptor and allows creating gradients with more colors too. +Set the gradient definition. The pointed instance must exist while the object is alive. NULL to disable. It wraps `BG_GRAD_COLOR`, `BG_GRAD_DIR`, `BG_MAIN_STOP` and `BG_GRAD_STOP` into one descriptor and allows creating gradients with more colors too. If it's set other gradient related properties will be ignored' .. raw:: html - - -bg_dither_mode -~~~~~~~~~~~~~~ - -Set the dithering mode of the gradient of the background. The possible -values are: - -- :cpp:enumerator:`LV_DITHER_NONE` -- :cpp:enumerator:`LV_DITHER_ORDERED` -- :cpp:enumerator:`LV_DITHER_ERR_DIFF` - -.. raw:: html - - - -bg_img_src -~~~~~~~~~~ - -Set a background image. Can be a pointer to :cpp:struct:`lv_image_dsc_t`, a path to -a file or an ``LV_SYMBOL_...`` - -.. raw:: html - - - -bg_img_opa -~~~~~~~~~~ - -Set the opacity of the background image. Value 0, :cpp:enumerator:`LV_OPA_0` or -:cpp:enumerator:`LV_OPA_TRANSP` means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or -:cpp:enumerator:`LV_OPA_COVER` means fully covering, other values or LV_OPA_10, -LV_OPA_20, etc means semi transparency. - -.. raw:: html - - - -bg_img_recolor -~~~~~~~~~~~~~~ + + +bg_image_recolor +~~~~~~~~~~~~~~~~ Set a color to mix to the background image. .. raw:: html - - -bg_img_recolor_opa -~~~~~~~~~~~~~~~~~~ - -Set the intensity of background image recoloring. Value 0, :cpp:enumerator:`LV_OPA_0` -or :cpp:enumerator:`LV_OPA_TRANSP` means no mixing, 255, :cpp:enumerator:`LV_OPA_100` or -:cpp:enumerator:`LV_OPA_COVER` means full recoloring, other values or LV_OPA_10, -LV_OPA_20, etc are interpreted proportionally. - -.. raw:: html - - - -bg_img_tiled -~~~~~~~~~~~~ - -If enabled the background image will be tiled. The possible values are -``true`` or ``false``. - -.. raw:: html - - + Border ------ @@ -2244,107 +664,26 @@ Set the color of the border .. raw:: html - + border_opa ~~~~~~~~~~ -Set the opacity of the border. Value 0, :cpp:enumerator:`LV_OPA_0` or -:cpp:enumerator:`LV_OPA_TRANSP` means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or -:cpp:enumerator:`LV_OPA_COVER` means fully covering, other values or LV_OPA_10, -LV_OPA_20, etc means semi transparency. +Set the opacity of the border. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. .. raw:: html - + border_width ~~~~~~~~~~~~ @@ -2353,174 +692,45 @@ Set the width of the border. Only pixel values can be used. .. raw:: html - + border_side ~~~~~~~~~~~ -Set only which side(s) the border should be drawn. The possible values -are: - -- :cpp:enumerator:`LV_BORDER_SIDE_NONE` -- :cpp:enumerator:`LV_BORDER_SIDE_TOP` -- :cpp:enumerator:`LV_BORDER_SIDE_BOTTOM` -- :cpp:enumerator:`LV_BORDER_SIDE_LEFT` -- :cpp:enumerator:`LV_BORDER_SIDE_RIGHT` -- :cpp:enumerator:`LV_BORDER_SIDE_INTERNAL` - -OR-ed values can be used as well, e.g. :cpp:expr:`LV_BORDER_SIDE_TOP | LV_BORDER_SIDE_LEFT`. +Set only which side(s) the border should be drawn. The possible values are `LV_BORDER_SIDE_NONE/TOP/BOTTOM/LEFT/RIGHT/INTERNAL`. OR-ed values can be used as well, e.g. `LV_BORDER_SIDE_TOP | LV_BORDER_SIDE_LEFT`. .. raw:: html - + border_post ~~~~~~~~~~~ -Sets whether the border should be drawn before or after the children are -drawn. ``true``: after children, ``false``: before children +Sets whether the border should be drawn before or after the children are drawn. `true`: after children, `false`: before children .. raw:: html - + Outline ------- -Properties to describe the outline. It's like a border but drawn outside -of the rectangles. +Properties to describe the outline. It's like a border but drawn outside of the rectangles. outline_width ~~~~~~~~~~~~~ @@ -2529,51 +739,12 @@ Set the width of the outline in pixels. .. raw:: html - + outline_color ~~~~~~~~~~~~~ @@ -2582,161 +753,40 @@ Set the color of the outline. .. raw:: html - + outline_opa ~~~~~~~~~~~ -Set the opacity of the outline. Value 0, :cpp:enumerator:`LV_OPA_0` or -:cpp:enumerator:`LV_OPA_TRANSP` means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or -:cpp:enumerator:`LV_OPA_COVER` means fully covering, other values or LV_OPA_10, -LV_OPA_20, etc means semi transparency. +Set the opacity of the outline. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. .. raw:: html - + outline_pad ~~~~~~~~~~~ -Set the padding of the outline, i.e. the gap between object and the -outline. +Set the padding of the outline, i.e. the gap between object and the outline. .. raw:: html - + Shadow ------ @@ -2746,215 +796,58 @@ Properties to describe the shadow drawn under the rectangles. shadow_width ~~~~~~~~~~~~ -Set the width of the shadow in pixels. The value should be ``>= 0``. +Set the width of the shadow in pixels. The value should be >= 0. .. raw:: html - + shadow_offset_x -~~~~~~~~~~~~ +~~~~~~~~~~~~~~~ Set an offset on the shadow in pixels in X direction. .. raw:: html - + shadow_offset_y -~~~~~~~~~~~~ +~~~~~~~~~~~~~~~ Set an offset on the shadow in pixels in Y direction. .. raw:: html - + shadow_spread ~~~~~~~~~~~~~ -Make the shadow calculation to use a larger or smaller rectangle as -base. The value can be in pixel to make the area larger/smaller +Make the shadow calculation to use a larger or smaller rectangle as base. The value can be in pixel to make the area larger/smaller .. raw:: html - + shadow_color ~~~~~~~~~~~~ @@ -2963,277 +856,73 @@ Set the color of the shadow .. raw:: html - + shadow_opa ~~~~~~~~~~ -Set the opacity of the shadow. Value 0, :cpp:enumerator:`LV_OPA_0` or -:cpp:enumerator:`LV_OPA_TRANSP` means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or -:cpp:enumerator:`LV_OPA_COVER` means fully covering, other values or LV_OPA_10, -LV_OPA_20, etc means semi transparency. +Set the opacity of the shadow. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. .. raw:: html - + Image ----- Properties to describe the images -img_opa -~~~~~~~ +image_opa +~~~~~~~~~ -Set the opacity of an image. Value 0, :cpp:enumerator:`LV_OPA_0` or :cpp:enumerator:`LV_OPA_TRANSP` -means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or :cpp:enumerator:`LV_OPA_COVER` means -fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi -transparency. +Set the opacity of an image. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. .. raw:: html - - -img_recolor -~~~~~~~~~~~ +image_recolor +~~~~~~~~~~~~~ Set color to mixt to the image. .. raw:: html - - -img_recolor_opa -~~~~~~~~~~~~~~~ - -Set the intensity of the color mixing. Value 0, :cpp:enumerator:`LV_OPA_0` or -:cpp:enumerator:`LV_OPA_TRANSP` means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or -:cpp:enumerator:`LV_OPA_COVER` means fully covering, other values or LV_OPA_10, -LV_OPA_20, etc means semi transparency. - -.. raw:: html - - + Line ---- @@ -3247,213 +936,54 @@ Set the width of the lines in pixel. .. raw:: html - + line_dash_width ~~~~~~~~~~~~~~~ -Set the width of dashes in pixel. Note that dash works only on -horizontal and vertical lines +Set the width of dashes in pixel. Note that dash works only on horizontal and vertical lines .. raw:: html - + line_dash_gap ~~~~~~~~~~~~~ -Set the gap between dashes in pixel. Note that dash works only on -horizontal and vertical lines +Set the gap between dashes in pixel. Note that dash works only on horizontal and vertical lines .. raw:: html - + line_rounded ~~~~~~~~~~~~ -Make the end points of the lines rounded. ``true``: rounded, ``false``: -perpendicular line ending +Make the end points of the lines rounded. `true`: rounded, `false`: perpendicular line ending .. raw:: html - + line_color ~~~~~~~~~~ @@ -3462,51 +992,12 @@ Set the color of the lines. .. raw:: html - + line_opa ~~~~~~~~ @@ -3515,51 +1006,12 @@ Set the opacity of the lines. .. raw:: html - + Arc --- @@ -3573,105 +1025,26 @@ Set the width (thickness) of the arcs in pixel. .. raw:: html - + arc_rounded ~~~~~~~~~~~ -Make the end points of the arcs rounded. ``true``: rounded, ``false``: -perpendicular line ending +Make the end points of the arcs rounded. `true`: rounded, `false`: perpendicular line ending .. raw:: html - + arc_color ~~~~~~~~~ @@ -3680,51 +1053,12 @@ Set the color of the arc. .. raw:: html - + arc_opa ~~~~~~~ @@ -3733,112 +1067,31 @@ Set the opacity of the arcs. .. raw:: html - - -arc_img_src -~~~~~~~~~~~ - -Set an image from which the arc will be masked out. It's useful to -display complex effects on the arcs. Can be a pointer to -:cpp:struct:`lv_image_dsc_t` or a path to a file - -.. raw:: html - - + Text ---- -Properties to describe the properties of text. All these properties are -inherited. +Properties to describe the properties of text. All these properties are inherited. text_color ~~~~~~~~~~ @@ -3847,160 +1100,40 @@ Sets the color of the text. .. raw:: html - + text_opa ~~~~~~~~ -Set the opacity of the text. Value 0, :cpp:enumerator:`LV_OPA_0` or :cpp:enumerator:`LV_OPA_TRANSP` -means fully transparent, 255, :cpp:enumerator:`LV_OPA_100` or :cpp:enumerator:`LV_OPA_COVER` means -fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi -transparency. +Set the opacity of the text. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. .. raw:: html - + text_font ~~~~~~~~~ -Set the font of the text (a pointer :cpp:type:`lv_font_t` ``*``). +Set the font of the text (a pointer `lv_font_t *`). .. raw:: html - + text_letter_space ~~~~~~~~~~~~~~~~~ @@ -4009,51 +1142,12 @@ Set the letter space in pixels .. raw:: html - + text_line_space ~~~~~~~~~~~~~~~ @@ -4062,171 +1156,40 @@ Set the line space in pixels. .. raw:: html - + text_decor ~~~~~~~~~~ -Set decoration for the text. The possible values are: - -- :cpp:enumerator:`LV_TEXT_DECOR_NONE` -- :cpp:enumerator:`LV_TEXT_DECOR_UNDERLINE` -- :cpp:enumerator:`LV_TEXT_DECOR_STRIKETHROUGH` - -OR-ed values can be used as well. +Set decoration for the text. The possible values are `LV_TEXT_DECOR_NONE/UNDERLINE/STRIKETHROUGH`. OR-ed values can be used as well. .. raw:: html - + text_align ~~~~~~~~~~ -Set how to align the lines of the text. Note that it doesn't align the -object itself, only the lines inside the object. The possible values are: - -- :cpp:enumerator:`LV_TEXT_ALIGN_LEFT` -- :cpp:enumerator:`LV_TEXT_ALIGN_CENTER` -- :cpp:enumerator:`LV_TEXT_ALIGN_RIGHT` -- :cpp:enumerator:`LV_TEXT_ALIGN_AUTO` ` - -:cpp:enumerator:`LV_TEXT_ALIGN_AUTO` detect the text base direction and uses left or right alignment accordingly +Set how to align the lines of the text. Note that it doesn't align the object itself, only the lines inside the object. The possible values are `LV_TEXT_ALIGN_LEFT/CENTER/RIGHT/AUTO`. `LV_TEXT_ALIGN_AUTO` detect the text base direction and uses left or right alignment accordingly .. raw:: html - + Miscellaneous ------------- @@ -4236,166 +1199,58 @@ Mixed properties for various purposes. radius ~~~~~~ -Set the radius on every corner. The value is interpreted in pixel (>= 0) -or :c:macro:`LV_RADIUS_CIRCLE` for max. radius +Set the radius on every corner. The value is interpreted in pixel (>= 0) or `LV_RADIUS_CIRCLE` for max. radius .. raw:: html - + clip_corner ~~~~~~~~~~~ -Enable to clip the overflowed content on the rounded corner. Can be -``true`` or ``false``. +Enable to clip the overflowed content on the rounded corner. Can be `true` or `false`. .. raw:: html - + opa ~~~ -Scale down all opacity values of the object by this factor. Value 0, -:cpp:enumerator:`LV_OPA_0` or :cpp:enumerator:`LV_OPA_TRANSP` means fully transparent, 255, -:cpp:enumerator:`LV_OPA_100` or :cpp:enumerator:`LV_OPA_COVER` means fully covering, other values or -LV_OPA_10, LV_OPA_20, etc means semi transparency. +Scale down all opacity values of the object by this factor. Value 0, `LV_OPA_0` or `LV_OPA_TRANSP` means fully transparent, 255, `LV_OPA_100` or `LV_OPA_COVER` means fully covering, other values or LV_OPA_10, LV_OPA_20, etc means semi transparency. .. raw:: html - + color_filter_dsc ~~~~~~~~~~~~~~~~ @@ -4404,51 +1259,12 @@ Mix a color to all colors of the object. .. raw:: html - + color_filter_opa ~~~~~~~~~~~~~~~~ @@ -4457,438 +1273,327 @@ The intensity of mixing of color filter. .. raw:: html - + anim ~~~~ -The animation template for the object's animation. Should be a pointer -to :cpp:type:`lv_anim_t`. The animation parameters are widget specific, -e.g. animation time could be the E.g. blink time of the cursor on the -text area or scroll time of a roller. See the widgets' documentation to -learn more. +The animation template for the object's animation. Should be a pointer to `lv_anim_t`. The animation parameters are widget specific, e.g. animation time could be the E.g. blink time of the cursor on the text area or scroll time of a roller. See the widgets' documentation to learn more. .. raw:: html - - -anim_time -~~~~~~~~~ - -The animation time in milliseconds. Its meaning is widget specific. E.g. -blink time of the cursor on the text area or scroll time of a roller. -See the widgets' documentation to learn more. - -.. raw:: html - - - -anim_speed -~~~~~~~~~~ - -The animation speed in pixel/sec. Its meaning is widget specific. E.g. -scroll speed of label. See the widgets' documentation to learn more. - -.. raw:: html - - + transition ~~~~~~~~~~ -An initialized :cpp:struct:`lv_style_transition_dsc_t` to describe a transition. +An initialized `lv_style_transition_dsc_t` to describe a transition. .. raw:: html - + blend_mode ~~~~~~~~~~ -Describes how to blend the colors to the background. The possible values -are: - -- :cpp:enumerator:`LV_BLEND_MODE_NORMAL` -- :cpp:enumerator:`LV_BLEND_MODE_ADDITIVE` -- :cpp:enumerator:`LV_BLEND_MODE_SUBTRACTIVE` -- :cpp:enumerator:`LV_BLEND_MODE_MULTIPLY` +Describes how to blend the colors to the background. The possible values are `LV_BLEND_MODE_NORMAL/ADDITIVE/SUBTRACTIVE/MULTIPLY` .. raw:: html - + layout ~~~~~~ -Set the layout if the object. The children will be repositioned and -resized according to the policies set for the layout. For the possible -values see the documentation of the layouts. +Set the layout if the object. The children will be repositioned and resized according to the policies set for the layout. For the possible values see the documentation of the layouts. .. raw:: html - + base_dir ~~~~~~~~ -Set the base direction of the object. The possible values are: - -- :cpp:enumerator:`LV_BASE_DIR_LTR` -- :cpp:enumerator:`LV_BASE_DIR_RTL` -- :cpp:enumerator:`LV_BASE_DIR_AUTO`. +Set the base direction of the object. The possible values are `LV_BIDI_DIR_LTR/RTL/AUTO`. .. raw:: html - + + +grid_row_align +~~~~~~~~~~~~~~ + +Defines how to distribute the rows. + +.. raw:: html + + + +grid_cell_column_pos +~~~~~~~~~~~~~~~~~~~~ + +Set the column in which the object should be placed + +.. raw:: html + + + +grid_cell_x_align +~~~~~~~~~~~~~~~~~ + +Set how to align the object horizontally. + +.. raw:: html + + + +grid_cell_column_span +~~~~~~~~~~~~~~~~~~~~~ + +Set how many columns the object should span. Needs to be >= 1 + +.. raw:: html + + + +grid_cell_row_pos +~~~~~~~~~~~~~~~~~ + +Set the row in which the object should be placed + +.. raw:: html + + + +grid_cell_y_align +~~~~~~~~~~~~~~~~~ + +Set how to align the object vertically. + +.. raw:: html + + + +grid_cell_row_span +~~~~~~~~~~~~~~~~~~ + +Set how many rows the object should span. Needs to be >= 1 + +.. raw:: html + + diff --git a/examples/others/fragment/lv_example_fragment_1.c b/examples/others/fragment/lv_example_fragment_1.c index 63e931cd2..cb3470a01 100644 --- a/examples/others/fragment/lv_example_fragment_1.c +++ b/examples/others/fragment/lv_example_fragment_1.c @@ -23,7 +23,7 @@ static const lv_fragment_class_t sample_cls = { .constructor_cb = sample_fragment_ctor, .create_obj_cb = sample_fragment_create_obj, .instance_size = sizeof(struct sample_fragment_t), -}; + }; void lv_example_fragment_1(void) { diff --git a/scripts/style_api_gen.py b/scripts/style_api_gen.py index ad651051f..f1a3231ff 100755 --- a/scripts/style_api_gen.py +++ b/scripts/style_api_gen.py @@ -558,7 +558,9 @@ def style_const_set(p): def docs(p): if "section" in p: print("") - print("## " + p['section']) + print(p['section']) + print("-" * len(p['section'])) + print("") print(p['dsc']) return @@ -575,20 +577,26 @@ def docs(p): e = "No" if p["ext_draw"]: e = "Yes" - li_style = "style='display:inline; margin-right: 20px; margin-left: 0px" + li_style = "style='display:inline-block; margin-right: 20px; margin-left: 0px" dsc = p['dsc'] print("") - print("### " + p["name"].lower()) + print(p["name"].lower()) + print("~" * len(p["name"].lower())) + print("") print(dsc) - print("") + + print("") + print(".. raw:: html") + print("") + print(" ") def guard_proc(p): global guard @@ -597,7 +605,7 @@ def guard_proc(p): guard_close() if 'guard' in p: guard = p['guard'] - print(f"#if {guard}\n") + print(f"#if {guard}") def guard_close(): global guard @@ -684,8 +692,11 @@ guard_close() print() print('#endif /* LV_STYLE_GEN_H */') -sys.stdout = open(base_dir + '/../docs/overview/style-props.md', 'w') +sys.stdout = open(base_dir + '/../docs/overview/style-props.rst', 'w') + +print('================') +print('Style properties') +print('================') -print('# Style properties') for p in props: docs(p) diff --git a/src/core/lv_obj_style_gen.c b/src/core/lv_obj_style_gen.c index 6e7a63c84..f735169ef 100644 --- a/src/core/lv_obj_style_gen.c +++ b/src/core/lv_obj_style_gen.c @@ -690,7 +690,8 @@ void lv_obj_set_style_opa_layered(lv_obj_t * obj, lv_opa_t value, lv_style_selec lv_obj_set_local_style_prop(obj, LV_STYLE_OPA_LAYERED, v, selector); } -void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector) +void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, + lv_style_selector_t selector) { lv_style_value_t v = { .ptr = value @@ -763,7 +764,6 @@ void lv_obj_set_style_bitmap_mask_src(lv_obj_t * obj, const lv_image_dsc_t * val } #if LV_USE_FLEX - void lv_obj_set_style_flex_flow(lv_obj_t * obj, lv_flex_flow_t value, lv_style_selector_t selector) { lv_style_value_t v = { @@ -807,7 +807,6 @@ void lv_obj_set_style_flex_grow(lv_obj_t * obj, uint8_t value, lv_style_selector #if LV_USE_GRID - void lv_obj_set_style_grid_column_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector) { lv_style_value_t v = { diff --git a/src/core/lv_obj_style_gen.h b/src/core/lv_obj_style_gen.h index 7f8eb6a08..2ddf24b39 100644 --- a/src/core/lv_obj_style_gen.h +++ b/src/core/lv_obj_style_gen.h @@ -226,7 +226,8 @@ static inline lv_color_t lv_obj_get_style_bg_grad_color(const lv_obj_t * obj, ui static inline lv_color_t lv_obj_get_style_bg_grad_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_BG_GRAD_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, + LV_STYLE_BG_GRAD_COLOR)); return v.color; } @@ -286,7 +287,8 @@ static inline lv_color_t lv_obj_get_style_bg_image_recolor(const lv_obj_t * obj, static inline lv_color_t lv_obj_get_style_bg_image_recolor_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_BG_IMAGE_RECOLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, + LV_STYLE_BG_IMAGE_RECOLOR)); return v.color; } @@ -310,7 +312,8 @@ static inline lv_color_t lv_obj_get_style_border_color(const lv_obj_t * obj, uin static inline lv_color_t lv_obj_get_style_border_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_BORDER_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, + LV_STYLE_BORDER_COLOR)); return v.color; } @@ -352,7 +355,8 @@ static inline lv_color_t lv_obj_get_style_outline_color(const lv_obj_t * obj, ui static inline lv_color_t lv_obj_get_style_outline_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_OUTLINE_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, + LV_STYLE_OUTLINE_COLOR)); return v.color; } @@ -400,7 +404,8 @@ static inline lv_color_t lv_obj_get_style_shadow_color(const lv_obj_t * obj, uin static inline lv_color_t lv_obj_get_style_shadow_color_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_SHADOW_COLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, + LV_STYLE_SHADOW_COLOR)); return v.color; } @@ -424,7 +429,8 @@ static inline lv_color_t lv_obj_get_style_image_recolor(const lv_obj_t * obj, ui static inline lv_color_t lv_obj_get_style_image_recolor_filtered(const lv_obj_t * obj, uint32_t part) { - lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, LV_STYLE_IMAGE_RECOLOR)); + lv_style_value_t v = _lv_obj_style_apply_color_filter(obj, part, lv_obj_get_style_prop(obj, part, + LV_STYLE_IMAGE_RECOLOR)); return v.color; } @@ -639,7 +645,6 @@ static inline const lv_image_dsc_t * lv_obj_get_style_bitmap_mask_src(const lv_o } #if LV_USE_FLEX - static inline lv_flex_flow_t lv_obj_get_style_flex_flow(const lv_obj_t * obj, uint32_t part) { lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_FLEX_FLOW); @@ -673,7 +678,6 @@ static inline uint8_t lv_obj_get_style_flex_grow(const lv_obj_t * obj, uint32_t #endif /*LV_USE_FLEX*/ #if LV_USE_GRID - static inline const int32_t * lv_obj_get_style_grid_column_dsc_array(const lv_obj_t * obj, uint32_t part) { lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_GRID_COLUMN_DSC_ARRAY); @@ -821,7 +825,8 @@ void lv_obj_set_style_radius(lv_obj_t * obj, int32_t value, lv_style_selector_t void lv_obj_set_style_clip_corner(lv_obj_t * obj, bool value, lv_style_selector_t selector); void lv_obj_set_style_opa(lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector); void lv_obj_set_style_opa_layered(lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector); -void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, lv_style_selector_t selector); +void lv_obj_set_style_color_filter_dsc(lv_obj_t * obj, const lv_color_filter_dsc_t * value, + lv_style_selector_t selector); void lv_obj_set_style_color_filter_opa(lv_obj_t * obj, lv_opa_t value, lv_style_selector_t selector); void lv_obj_set_style_anim(lv_obj_t * obj, const lv_anim_t * value, lv_style_selector_t selector); void lv_obj_set_style_anim_duration(lv_obj_t * obj, uint32_t value, lv_style_selector_t selector); @@ -831,26 +836,24 @@ void lv_obj_set_style_layout(lv_obj_t * obj, uint16_t value, lv_style_selector_t void lv_obj_set_style_base_dir(lv_obj_t * obj, lv_base_dir_t value, lv_style_selector_t selector); void lv_obj_set_style_bitmap_mask_src(lv_obj_t * obj, const lv_image_dsc_t * value, lv_style_selector_t selector); #if LV_USE_FLEX - -void lv_obj_set_style_flex_flow(lv_obj_t * obj, lv_flex_flow_t value, lv_style_selector_t selector); -void lv_obj_set_style_flex_main_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); -void lv_obj_set_style_flex_cross_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); -void lv_obj_set_style_flex_track_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); -void lv_obj_set_style_flex_grow(lv_obj_t * obj, uint8_t value, lv_style_selector_t selector); + void lv_obj_set_style_flex_flow(lv_obj_t * obj, lv_flex_flow_t value, lv_style_selector_t selector); + void lv_obj_set_style_flex_main_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); + void lv_obj_set_style_flex_cross_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); + void lv_obj_set_style_flex_track_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector); + void lv_obj_set_style_flex_grow(lv_obj_t * obj, uint8_t value, lv_style_selector_t selector); #endif /*LV_USE_FLEX*/ #if LV_USE_GRID - -void lv_obj_set_style_grid_column_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); -void lv_obj_set_style_grid_column_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); -void lv_obj_set_style_grid_row_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); -void lv_obj_set_style_grid_row_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); -void lv_obj_set_style_grid_cell_column_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); -void lv_obj_set_style_grid_cell_x_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); -void lv_obj_set_style_grid_cell_column_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); -void lv_obj_set_style_grid_cell_row_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); -void lv_obj_set_style_grid_cell_y_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); -void lv_obj_set_style_grid_cell_row_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_column_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); + void lv_obj_set_style_grid_column_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_row_dsc_array(lv_obj_t * obj, const int32_t * value, lv_style_selector_t selector); + void lv_obj_set_style_grid_row_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_cell_column_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_cell_x_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_cell_column_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_cell_row_pos(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_cell_y_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector); + void lv_obj_set_style_grid_cell_row_span(lv_obj_t * obj, int32_t value, lv_style_selector_t selector); #endif /*LV_USE_GRID*/ diff --git a/src/misc/lv_style_gen.c b/src/misc/lv_style_gen.c index 3ecfde585..3fce9532f 100644 --- a/src/misc/lv_style_gen.c +++ b/src/misc/lv_style_gen.c @@ -6,8 +6,10 @@ ********************************************************************** */ + #include "lv_style.h" + void lv_style_set_width(lv_style_t * style, int32_t value) { lv_style_value_t v = { @@ -1102,3 +1104,4 @@ void lv_style_set_grid_cell_row_span(lv_style_t * style, int32_t value) const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_ROW_SPAN = LV_STYLE_GRID_CELL_ROW_SPAN; #endif /*LV_USE_GRID*/ + diff --git a/src/misc/lv_style_gen.h b/src/misc/lv_style_gen.h index b66c17436..9d65add62 100644 --- a/src/misc/lv_style_gen.h +++ b/src/misc/lv_style_gen.h @@ -6,6 +6,7 @@ ********************************************************************** */ + #ifndef LV_STYLE_GEN_H #define LV_STYLE_GEN_H @@ -198,7 +199,6 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BA void lv_style_set_bitmap_mask_src(lv_style_t * style, const lv_image_dsc_t * value); LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BITMAP_MASK_SRC; #if LV_USE_FLEX - void lv_style_set_flex_flow(lv_style_t * style, lv_flex_flow_t value); LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_FLEX_FLOW; void lv_style_set_flex_main_place(lv_style_t * style, lv_flex_align_t value); @@ -212,7 +212,6 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BI #endif /*LV_USE_FLEX*/ #if LV_USE_GRID - void lv_style_set_grid_column_dsc_array(lv_style_t * style, const int32_t * value); LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_COLUMN_DSC_ARRAY; void lv_style_set_grid_column_align(lv_style_t * style, lv_grid_align_t value); @@ -235,6 +234,7 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BI LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_GRID_CELL_ROW_SPAN; #endif /*LV_USE_GRID*/ + #define LV_STYLE_CONST_WIDTH(val) \ { \ .prop_ptr = &_lv_style_const_prop_id_WIDTH, .value = { .num = (int32_t)val } \ @@ -785,4 +785,5 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_style_prop_t _lv_style_const_prop_id_BI } #endif /*LV_USE_GRID*/ + #endif /* LV_STYLE_GEN_H */