From 929278320487ffa2114e436cb2c41434bf45a311 Mon Sep 17 00:00:00 2001 From: Denis Feklushkin Date: Sun, 12 Nov 2017 20:45:13 +0700 Subject: [PATCH 1/2] orientation const added --- src/dlangui/widgets/controls.d | 2 +- src/dlangui/widgets/layouts.d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dlangui/widgets/controls.d b/src/dlangui/widgets/controls.d index 68e61ce8..3f9642d7 100644 --- a/src/dlangui/widgets/controls.d +++ b/src/dlangui/widgets/controls.d @@ -362,7 +362,7 @@ class ImageTextButton : HorizontalLayout { override @property Widget text(UIString s) { _label.text = s; requestLayout(); return this; } /// Returns orientation: Vertical - image top, Horizontal - image left" - override @property Orientation orientation() { + override @property Orientation orientation() const { return super.orientation(); } diff --git a/src/dlangui/widgets/layouts.d b/src/dlangui/widgets/layouts.d index 57c906a2..ee29b698 100644 --- a/src/dlangui/widgets/layouts.d +++ b/src/dlangui/widgets/layouts.d @@ -521,7 +521,7 @@ class ResizerWidget : Widget { class LinearLayout : WidgetGroupDefaultDrawing { protected Orientation _orientation = Orientation.Vertical; /// returns linear layout orientation (Vertical, Horizontal) - @property Orientation orientation() { return _orientation; } + @property Orientation orientation() const { return _orientation; } /// sets linear layout orientation @property LinearLayout orientation(Orientation value) { _orientation = value; requestLayout(); return this; } From 9cbac64292f1f8322d29c0548c7b7df22c87734f Mon Sep 17 00:00:00 2001 From: Denis Feklushkin Date: Tue, 14 Nov 2017 16:07:06 +0700 Subject: [PATCH 2/2] external config flags removed, users should add it to external configs --- src/dlangui/core/config.d | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/dlangui/core/config.d b/src/dlangui/core/config.d index f172ef21..fc0daa81 100644 --- a/src/dlangui/core/config.d +++ b/src/dlangui/core/config.d @@ -108,17 +108,7 @@ version(USE_CONSOLE) { enum BACKEND_CONSOLE = false; } else version (USE_EXTERNAL) { // External backend already selected using version identifier - version (USE_OPENGL) { - enum ENABLE_OPENGL = true; - } else { - enum ENABLE_OPENGL = false; - } - enum BACKEND_GUI = false; - enum BACKEND_CONSOLE = false; - enum BACKEND_SDL = false; - enum BACKEND_X11 = false; - enum BACKEND_DSFML = false; - enum BACKEND_WIN32 = false; + // All config variables should be settled in external config file } else { // no backend selected: set default based on platform version (Windows) {