Skip to content

Commit 7f29741

Browse files
sadko4usadko4u
committed
Release 1.0.0
* Bugfixes for the tk::GraphDot widget. * Added new Display::wait_events() method for polling display for incoming events. * Updated rendering of tk::LedMeterChannel widget. * Fixed NULL dereference when linking styles in the schema. * Refactoring of widget rendering, allmost all usages of Color::scale_lightness replaced with Color::scale_lch_luminance. * Added 'reduce' options to prop::Allocation property. * Added 'reduce' options handling by tk::Box and tk::Grid widgets. * Fixed bug in prop::StringList which could yield to ignore of localization parameters. * Added support of CIE XYZ D65, CIE LAB D65, CIE LCH D65 and CMYK color schemes for tk::Color property. * Implemented tk::Schema::add methods for adding custom styles at the initialization stage. * Fixed bug in clipboard paste for tk::TextDataSink class. * Updated brightness control for LED channels grouped into LED meters. * Added border radius support to the tk::Menu widget. * Fixed prolbem with scrollbar sync for the tk::ListBox widget.
2 parents 774931d + 2089a9a commit 7f29741

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2598
-1310
lines changed

‎CHANGELOG‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 1.0.0 ===
6+
* Bugfixes for the tk::GraphDot widget.
7+
* Added new Display::wait_events() method for polling display for incoming events.
8+
* Updated rendering of tk::LedMeterChannel widget.
9+
* Fixed NULL dereference when linking styles in the schema.
10+
* Refactoring of widget rendering, allmost all usages of Color::scale_lightness
11+
replaced with Color::scale_lch_luminance.
12+
* Added 'reduce' options to prop::Allocation property.
13+
* Added 'reduce' options handling by tk::Box and tk::Grid widgets.
14+
* Fixed bug in prop::StringList which could yield to ignore of localization parameters.
15+
* Added support of CIE XYZ D65, CIE LAB D65, CIE LCH D65 and CMYK color schemes for tk::Color property.
16+
* Implemented tk::Schema::add methods for adding custom styles at the initialization stage.
17+
* Fixed bug in clipboard paste for tk::TextDataSink class.
18+
* Updated brightness control for LED channels grouped into LED meters.
19+
* Added border radius support to the tk::Menu widget.
20+
* Fixed prolbem with scrollbar sync for the tk::ListBox widget.
21+
522
=== 0.5.1 ===
623
* Updated code to match lltl library headers.
724
* Better integration with system::follow_url() routine.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ include $(BASEDIR)/project.mk
4242

4343
# Setup paths
4444
CHK_CONFIG = test -f "$(CONFIG)" || (echo "System not properly configured. Please launch 'make config' first" && exit 1)
45-
DISTSRC_PATH = $(BUILDDIR)/.distsrc
45+
DISTSRC_PATH = $(BUILDDIR)/distsrc
4646
DISTSRC = $(DISTSRC_PATH)/$(ARTIFACT_NAME)
4747

4848
.DEFAULT_GOAL := all

‎dependencies.mk‎

Lines changed: 61 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -18,98 +18,65 @@
1818
# along with lsp-tk-lib. If not, see <https://www.gnu.org/licenses/>.
1919
#
2020

21-
# Variables that describe dependencies
22-
LSP_COMMON_LIB_VERSION := 1.0.14
23-
LSP_COMMON_LIB_NAME := lsp-common-lib
24-
LSP_COMMON_LIB_TYPE := src
25-
LSP_COMMON_LIB_URL := [email protected]:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
21+
# List of dependencies
22+
DEPENDENCIES = \
23+
LIBPTHREAD \
24+
LIBDL \
25+
LSP_COMMON_LIB \
26+
LSP_LLTL_LIB \
27+
LSP_R3D_IFACE \
28+
LSP_RUNTIME_LIB \
29+
LSP_DSP_LIB \
30+
LSP_WS_LIB
31+
32+
TEST_DEPENDENCIES = \
33+
LSP_TEST_FW
34+
35+
ifeq ($(PLATFORM),Linux)
36+
DEPENDENCIES += \
37+
LIBSNDFILE \
38+
LIBX11 \
39+
LIBCAIRO \
40+
LIBFREETYPE
41+
42+
TEST_DEPENDENCIES += \
43+
LSP_R3D_BASE_LIB \
44+
LSP_R3D_GLX_LIB \
45+
LIBGL
46+
endif
47+
48+
ifeq ($(PLATFORM),BSD)
49+
DEPENDENCIES += \
50+
LIBSNDFILE \
51+
LIBICONV \
52+
LIBX11 \
53+
LIBCAIRO \
54+
LIBICONV \
55+
LIBFREETYPE
56+
57+
TEST_DEPENDENCIES += \
58+
LSP_R3D_BASE_LIB \
59+
LSP_R3D_GLX_LIB \
60+
LIBGL
61+
endif
62+
63+
ifeq ($(PLATFORM),Windows)
64+
DEPENDENCIES += \
65+
LIBSHLWAPI \
66+
LIBWINMM \
67+
LIBMSACM
68+
endif
69+
70+
ALL_DEPENDENCIES = \
71+
$(DEPENDENCIES) \
72+
$(TEST_DEPENDENCIES) \
73+
LIBSNDFILE \
74+
LIBCAIRO \
75+
LIBFREETYPE \
76+
LIBICONV \
77+
LIBX11 \
78+
LIBGL \
79+
LIBSHLWAPI \
80+
LIBWINMM \
81+
LIBMSACM \
2682

27-
LSP_LLTL_LIB_VERSION := 0.5.7
28-
LSP_LLTL_LIB_NAME := lsp-lltl-lib
29-
LSP_LLTL_LIB_TYPE := src
30-
LSP_LLTL_LIB_URL := [email protected]:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
31-
32-
LSP_RUNTIME_LIB_VERSION := 0.5.10
33-
LSP_RUNTIME_LIB_NAME := lsp-runtime-lib
34-
LSP_RUNTIME_LIB_TYPE := src
35-
LSP_RUNTIME_LIB_URL := [email protected]:lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git
36-
37-
LSP_R3D_IFACE_VERSION := 0.5.2
38-
LSP_R3D_IFACE_NAME := lsp-r3d-iface
39-
LSP_R3D_IFACE_TYPE := src
40-
LSP_R3D_IFACE_URL := [email protected]:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
41-
42-
LSP_R3D_BASE_LIB_VERSION := 0.5.5
43-
LSP_R3D_BASE_LIB_NAME := lsp-r3d-base-lib
44-
LSP_R3D_BASE_LIB_TYPE := src
45-
LSP_R3D_BASE_LIB_URL := [email protected]:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
46-
47-
LSP_R3D_GLX_LIB_VERSION := 0.5.4
48-
LSP_R3D_GLX_LIB_NAME := lsp-r3d-glx-lib
49-
LSP_R3D_GLX_LIB_TYPE := src
50-
LSP_R3D_GLX_LIB_URL := [email protected]:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
51-
52-
LSP_WS_LIB_VERSION := 0.5.4
53-
LSP_WS_LIB_NAME := lsp-ws-lib
54-
LSP_WS_LIB_TYPE := src
55-
LSP_WS_LIB_URL := [email protected]:lsp-plugins/$(LSP_WS_LIB_NAME).git
56-
57-
LSP_DSP_LIB_VERSION := 0.5.14
58-
LSP_DSP_LIB_NAME := lsp-dsp-lib
59-
LSP_DSP_LIB_TYPE := src
60-
LSP_DSP_LIB_URL := [email protected]:lsp-plugins/$(LSP_DSP_LIB_NAME).git
61-
62-
LSP_TEST_FW_VERSION := 1.0.8
63-
LSP_TEST_FW_NAME := lsp-test-fw
64-
LSP_TEST_FW_TYPE := src
65-
LSP_TEST_FW_URL := [email protected]:lsp-plugins/$(LSP_TEST_FW_NAME).git
66-
67-
LIBPTHREAD_VERSION := system
68-
LIBPTHREAD_NAME := libpthread
69-
LIBPTHREAD_TYPE := opt
70-
LIBPTHREAD_LDFLAGS := -lpthread
71-
72-
LIBDL_VERSION := system
73-
LIBDL_NAME := libdl
74-
LIBDL_TYPE := opt
75-
LIBDL_LDFLAGS := -ldl
76-
77-
LIBICONV_VERSION := system
78-
LIBICONV_NAME := libiconv
79-
LIBICONV_TYPE := opt
80-
LIBICONV_LDFLAGS := -liconv
81-
82-
LIBSHLWAPI_VERSION := system
83-
LIBSHLWAPI_NAME := libshlwapi
84-
LIBSHLWAPI_TYPE := opt
85-
LIBSHLWAPI_LDFLAGS := -lshlwapi
86-
87-
LIBWINMM_VERSION := system
88-
LIBWINMM_NAME := libwinmm
89-
LIBWINMM_TYPE := opt
90-
LIBWINMM_LDFLAGS := -lwinmm
91-
92-
LIBMSACM_VERSION := system
93-
LIBMSACM_NAME := libmsacm
94-
LIBMSACM_TYPE := opt
95-
LIBMSACM_LDFLAGS := -lmsacm32
96-
97-
LIBSNDFILE_VERSION := system
98-
LIBSNDFILE_NAME := sndfile
99-
LIBSNDFILE_TYPE := pkg
100-
101-
LIBX11_VERSION := system
102-
LIBX11_NAME := x11
103-
LIBX11_TYPE := pkg
104-
105-
LIBGL_VERSION := system
106-
LIBGL_NAME := gl
107-
LIBGL_TYPE := pkg
108-
109-
LIBCAIRO_VERSION := system
110-
LIBCAIRO_NAME := cairo
111-
LIBCAIRO_TYPE := pkg
112-
113-
LIBFREETYPE_VERSION := system
114-
LIBFREETYPE_NAME := freetype2
115-
LIBFREETYPE_TYPE := pkg

‎include/lsp-plug.in/tk/helpers/graphics.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,22 @@ namespace lsp
6868
float x, float y // Coordinates of dot
6969
);
7070

71-
bool clip_line2d(
72-
float dx, float dy, // Line equation
71+
bool clip_line2d_vec(
72+
float dx, float dy, // Line direction
7373
float lc, float rc, float tc, float bc, // Corners from left, right, top, bottom
7474
float error, // Allowed error
7575
float &cx1, float &cy1, float &cx2, float &cy2 // Results
7676
);
7777

78-
bool clip_line2d(
78+
bool clip_line2d_eq(
7979
float a, float b, float c, // Line equation
8080
float lc, float rc, float tc, float bc, // Corners from left, right, top, bottom
8181
float error, // Allowed error
8282
float &cx1, float &cy1, float &cx2, float &cy2 // Results
8383
);
8484

85-
bool clip_line2d(
86-
float x1, float x2, float y1, float y2, // Coordinates of two points
85+
bool clip_line2d_coord(
86+
float x1, float x2, float y1, float y2, // Coordinates of two points laying on line
8787
float lc, float rc, float tc, float bc, // Corners from left, right, top, bottom
8888
float error, // Allowed error
8989
float &cx1, float &cy1, float &cx2, float &cy2 // Results

‎include/lsp-plug.in/tk/prop/base/Enum.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ namespace lsp
6565
public:
6666
status_t parse(const char *value);
6767
status_t parse(const LSPString *value);
68-
inline ssize_t set_index(ssize_t v) { return set(v); };
68+
inline ssize_t index() const { return nValue; }
69+
inline ssize_t set_index(ssize_t v) { return set(v); }
6970
};
7071
}
7172
}

‎include/lsp-plug.in/tk/prop/collection/StringList.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ namespace lsp
4444
class StringItem: public tk::String
4545
{
4646
public:
47-
explicit inline StringItem(prop::Listener *listener = NULL): tk::String(NULL) {};
47+
explicit inline StringItem(i18n::IDictionary *dict, prop::Listener *listener = NULL): tk::String(NULL)
48+
{
49+
pDict = dict;
50+
}
4851

4952
public:
5053
inline void invalidate(i18n::IDictionary *dict)
@@ -133,6 +136,11 @@ namespace lsp
133136
*/
134137
status_t remove(size_t index, size_t count);
135138

139+
/**
140+
* Clear the list.
141+
*/
142+
void clear();
143+
136144
/**
137145
* Remove string at the specified index
138146
* @param index index of the string

‎include/lsp-plug.in/tk/prop/collection/WidgetList.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ namespace lsp
5959
status_t premove(const Widget *w);
6060
status_t remove(size_t index);
6161
status_t remove(size_t index, size_t count);
62+
status_t truncate(size_t count);
6263
status_t insert(Widget *w, size_t index, bool manage);
6364
void clear();
6465
void flush();
@@ -86,6 +87,7 @@ namespace lsp
8687

8788
public:
8889
inline size_t size() const { return sList.size(); }
90+
inline bool is_empty() const { return sList.is_empty(); }
8991
inline status_t add(widget_t *w) { return GenericWidgetList::add(w, false); }
9092
inline status_t madd(widget_t *w) { return GenericWidgetList::add(w, true); }
9193
inline status_t insert(widget_t *w, size_t index) { return GenericWidgetList::insert(w, index, false); }

‎include/lsp-plug.in/tk/prop/flags/Allocation.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ namespace lsp
5252
F_VFILL,
5353
F_HEXPAND,
5454
F_VEXPAND,
55+
F_HREDUCE,
56+
F_VREDUCE,
5557

5658
F_TOTAL
5759
};
@@ -67,20 +69,27 @@ namespace lsp
6769
inline bool vfill() const { return Flags::get(F_VFILL); }
6870
inline bool hexpand() const { return Flags::get(F_HEXPAND); }
6971
inline bool vexpand() const { return Flags::get(F_VEXPAND); }
72+
inline bool hreduce() const { return Flags::get(F_HREDUCE); }
73+
inline bool vreduce() const { return Flags::get(F_VREDUCE); }
7074

7175
inline bool set_hfill(bool set = true) { return Flags::set(F_HFILL, set); }
7276
inline bool set_vfill(bool set = true) { return Flags::set(F_VFILL, set); }
7377
inline bool set_hexpand(bool set = true) { return Flags::set(F_HEXPAND, set); }
7478
inline bool set_vexpand(bool set = true) { return Flags::set(F_VEXPAND, set); }
79+
inline bool set_hreduce(bool set = true) { return Flags::set(F_HREDUCE, set); }
80+
inline bool set_vreduce(bool set = true) { return Flags::set(F_VREDUCE, set); }
7581

7682
void set_fill(bool hor, bool vert);
7783
void set_expand(bool hor, bool vert);
78-
void set_embed(bool hor, bool vert);
84+
void set_reduce(bool hor, bool vert);
7985
void set(bool hfill, bool vfill, bool hexpand, bool vexpand);
86+
void set(bool hfill, bool vfill, bool hexpand, bool vexpand, bool hreduce, bool vreduce);
8087

8188
inline void set_fill(bool fill = true) { set_fill(fill, fill); }
8289
inline void set_expand(bool expand = true) { set_expand(expand, expand); }
90+
inline void set_reduce(bool reduce= true) { set_reduce(reduce, reduce); }
8391
inline void set(bool fill, bool expand) { set(fill, fill, expand, expand); }
92+
inline void set(bool fill, bool expand, bool reduce) { set(fill, fill, expand, expand, reduce, reduce); }
8493
};
8594

8695
namespace prop

0 commit comments

Comments
 (0)