diff options
Diffstat (limited to 'include/cru/ui')
38 files changed, 48 insertions, 48 deletions
diff --git a/include/cru/ui/Base.h b/include/cru/ui/Base.h index 5e62d785..78b8ccf9 100644 --- a/include/cru/ui/Base.h +++ b/include/cru/ui/Base.h @@ -1,5 +1,5 @@ #pragma once -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Base.h" #include "cru/platform/gui/Base.h" diff --git a/include/cru/ui/ThemeManager.h b/include/cru/ui/ThemeManager.h index faa8a1cf..d4e6a096 100644 --- a/include/cru/ui/ThemeManager.h +++ b/include/cru/ui/ThemeManager.h @@ -1,6 +1,6 @@ #pragma once #include "Base.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/ThemeResourceDictionary.h" #include <vector> diff --git a/include/cru/ui/ThemeResourceDictionary.h b/include/cru/ui/ThemeResourceDictionary.h index 7112ab27..597fe707 100644 --- a/include/cru/ui/ThemeResourceDictionary.h +++ b/include/cru/ui/ThemeResourceDictionary.h @@ -1,7 +1,7 @@ #pragma once #include "Base.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/xml/XmlNode.h" #include "mapper/MapperRegistry.h" #include "style/StyleRuleSet.h" diff --git a/include/cru/ui/components/Component.h b/include/cru/ui/components/Component.h index a2f83149..ae742aae 100644 --- a/include/cru/ui/components/Component.h +++ b/include/cru/ui/components/Component.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" #include "../DeleteLater.h" -#include "cru/common/SelfResolvable.h" +#include "cru/base/SelfResolvable.h" namespace cru::ui::components { /** diff --git a/include/cru/ui/components/Menu.h b/include/cru/ui/components/Menu.h index 82766aa5..913f5c92 100644 --- a/include/cru/ui/components/Menu.h +++ b/include/cru/ui/components/Menu.h @@ -1,6 +1,6 @@ #pragma once #include "Component.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/ui/controls/Button.h" #include "cru/ui/controls/Control.h" #include "cru/ui/controls/FlexLayout.h" diff --git a/include/cru/ui/controls/Button.h b/include/cru/ui/controls/Button.h index 6df23c62..717710e8 100644 --- a/include/cru/ui/controls/Button.h +++ b/include/cru/ui/controls/Button.h @@ -5,7 +5,7 @@ #include "../render/BorderRenderObject.h" #include "IBorderControl.h" #include "IClickableControl.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::controls { class CRU_UI_API Button : public SingleChildControl<render::BorderRenderObject>, diff --git a/include/cru/ui/controls/Control.h b/include/cru/ui/controls/Control.h index 38a9a86b..790f4a3a 100644 --- a/include/cru/ui/controls/Control.h +++ b/include/cru/ui/controls/Control.h @@ -4,7 +4,7 @@ #include "../events/UiEvents.h" #include "../render/RenderObject.h" #include "../style/StyleRuleSet.h" -#include "cru/common/SelfResolvable.h" +#include "cru/base/SelfResolvable.h" #include "cru/ui/render/MeasureRequirement.h" namespace cru::ui::controls { diff --git a/include/cru/ui/controls/IBorderControl.h b/include/cru/ui/controls/IBorderControl.h index f8f2f88d..e3eb3388 100644 --- a/include/cru/ui/controls/IBorderControl.h +++ b/include/cru/ui/controls/IBorderControl.h @@ -1,6 +1,6 @@ #pragma once #include "../style/ApplyBorderStyleInfo.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::ui::controls { struct CRU_UI_API IBorderControl : virtual Interface { diff --git a/include/cru/ui/controls/ICheckableControl.h b/include/cru/ui/controls/ICheckableControl.h index 2c7aace8..7a6d7b8e 100644 --- a/include/cru/ui/controls/ICheckableControl.h +++ b/include/cru/ui/controls/ICheckableControl.h @@ -1,6 +1,6 @@ #pragma once #include "../Base.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::controls { struct CRU_UI_API ICheckableControl : virtual Interface { diff --git a/include/cru/ui/controls/IClickableControl.h b/include/cru/ui/controls/IClickableControl.h index 67fa43ab..4ddea730 100644 --- a/include/cru/ui/controls/IClickableControl.h +++ b/include/cru/ui/controls/IClickableControl.h @@ -1,7 +1,7 @@ #pragma once #include "../helper/ClickDetector.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::controls { struct CRU_UI_API IClickableControl : virtual Interface { diff --git a/include/cru/ui/controls/IconButton.h b/include/cru/ui/controls/IconButton.h index a76d01d4..632450e2 100644 --- a/include/cru/ui/controls/IconButton.h +++ b/include/cru/ui/controls/IconButton.h @@ -8,7 +8,7 @@ #include "IBorderControl.h" #include "IClickableControl.h" #include "IContentBrushControl.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/graphics/Brush.h" namespace cru::ui::controls { diff --git a/include/cru/ui/controls/RootControl.h b/include/cru/ui/controls/RootControl.h index 851b4db0..5fa8090e 100644 --- a/include/cru/ui/controls/RootControl.h +++ b/include/cru/ui/controls/RootControl.h @@ -1,7 +1,7 @@ #pragma once #include "LayoutControl.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/gui/Window.h" #include "cru/ui/host/WindowHost.h" #include "cru/ui/render/StackLayoutRenderObject.h" diff --git a/include/cru/ui/controls/Window.h b/include/cru/ui/controls/Window.h index a1a97f87..656a96dd 100644 --- a/include/cru/ui/controls/Window.h +++ b/include/cru/ui/controls/Window.h @@ -2,7 +2,7 @@ #include "cru/platform/gui/Base.h" #include "cru/ui/controls/RootControl.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" namespace cru::ui::controls { class CRU_UI_API Window final : public RootControl { diff --git a/include/cru/ui/document/DocumentElementType.h b/include/cru/ui/document/DocumentElementType.h index d16836c1..6d4958d0 100644 --- a/include/cru/ui/document/DocumentElementType.h +++ b/include/cru/ui/document/DocumentElementType.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include <vector> diff --git a/include/cru/ui/document/TextDocumentElement.h b/include/cru/ui/document/TextDocumentElement.h index 93b4933b..73a041ef 100644 --- a/include/cru/ui/document/TextDocumentElement.h +++ b/include/cru/ui/document/TextDocumentElement.h @@ -2,8 +2,8 @@ #include "../Base.h" #include "DocumentElement.h" -#include "cru/common/Base.h" -#include "cru/common/Bitmask.h" +#include "cru/base/Base.h" +#include "cru/base/Bitmask.h" namespace cru::ui::document { namespace details { diff --git a/include/cru/ui/events/RoutedEvent.h b/include/cru/ui/events/RoutedEvent.h index 909678f8..a01839a6 100644 --- a/include/cru/ui/events/RoutedEvent.h +++ b/include/cru/ui/events/RoutedEvent.h @@ -1,7 +1,7 @@ #pragma once #include "UiEventArgs.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::events { // TEventArgs must not be a reference type. This class help add reference. diff --git a/include/cru/ui/helper/ClickDetector.h b/include/cru/ui/helper/ClickDetector.h index 3bf28451..5e30d9c3 100644 --- a/include/cru/ui/helper/ClickDetector.h +++ b/include/cru/ui/helper/ClickDetector.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::helper { class ClickDetector; diff --git a/include/cru/ui/helper/ShortcutHub.h b/include/cru/ui/helper/ShortcutHub.h index fe3b2a72..341e76da 100644 --- a/include/cru/ui/helper/ShortcutHub.h +++ b/include/cru/ui/helper/ShortcutHub.h @@ -2,8 +2,8 @@ #include "../Base.h" #include "../events/KeyEventArgs.h" -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" #include "cru/platform/gui/Keyboard.h" #include <cstddef> diff --git a/include/cru/ui/host/WindowHost.h b/include/cru/ui/host/WindowHost.h index 17f69d89..23229036 100644 --- a/include/cru/ui/host/WindowHost.h +++ b/include/cru/ui/host/WindowHost.h @@ -2,7 +2,7 @@ #include "../Base.h" #include "../render/RenderObject.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" #include "cru/platform/gui/Window.h" diff --git a/include/cru/ui/mapper/BrushMapper.h b/include/cru/ui/mapper/BrushMapper.h index 0748c037..3b918dc7 100644 --- a/include/cru/ui/mapper/BrushMapper.h +++ b/include/cru/ui/mapper/BrushMapper.h @@ -1,6 +1,6 @@ #pragma once #include "Mapper.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Brush.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/FontMapper.h b/include/cru/ui/mapper/FontMapper.h index f6dbf56a..f8b10047 100644 --- a/include/cru/ui/mapper/FontMapper.h +++ b/include/cru/ui/mapper/FontMapper.h @@ -1,6 +1,6 @@ #pragma once #include "Mapper.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/platform/graphics/Font.h" namespace cru::ui::mapper { diff --git a/include/cru/ui/mapper/Mapper.h b/include/cru/ui/mapper/Mapper.h index e059f9c0..40e15186 100644 --- a/include/cru/ui/mapper/Mapper.h +++ b/include/cru/ui/mapper/Mapper.h @@ -1,8 +1,8 @@ #pragma once #include "../Base.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Exception.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Exception.h" #include "cru/xml/XmlNode.h" #include <memory> diff --git a/include/cru/ui/mapper/ThicknessMapper.h b/include/cru/ui/mapper/ThicknessMapper.h index 10f6c87e..fab1e5d3 100644 --- a/include/cru/ui/mapper/ThicknessMapper.h +++ b/include/cru/ui/mapper/ThicknessMapper.h @@ -2,7 +2,7 @@ #include "Mapper.h" #include "../Base.h" -#include "cru/common/Base.h" +#include "cru/base/Base.h" #include "cru/xml/XmlNode.h" namespace cru::ui::mapper { diff --git a/include/cru/ui/mapper/style/BorderStylerMapper.h b/include/cru/ui/mapper/style/BorderStylerMapper.h index 3cf78faa..57b5dce4 100644 --- a/include/cru/ui/mapper/style/BorderStylerMapper.h +++ b/include/cru/ui/mapper/style/BorderStylerMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../Mapper.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/style/IStylerMapper.h" #include "cru/ui/style/Styler.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/IConditionMapper.h b/include/cru/ui/mapper/style/IConditionMapper.h index 7610dc8d..bfe24224 100644 --- a/include/cru/ui/mapper/style/IConditionMapper.h +++ b/include/cru/ui/mapper/style/IConditionMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../../Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/Mapper.h" #include "cru/ui/style/Condition.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/IStylerMapper.h b/include/cru/ui/mapper/style/IStylerMapper.h index 4c2ecd16..adf9b6fb 100644 --- a/include/cru/ui/mapper/style/IStylerMapper.h +++ b/include/cru/ui/mapper/style/IStylerMapper.h @@ -1,6 +1,6 @@ #pragma once #include "../../Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/mapper/Mapper.h" #include "cru/ui/style/Styler.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/NoConditionMapper.h b/include/cru/ui/mapper/style/NoConditionMapper.h index 2103a268..06106514 100644 --- a/include/cru/ui/mapper/style/NoConditionMapper.h +++ b/include/cru/ui/mapper/style/NoConditionMapper.h @@ -1,8 +1,8 @@ #pragma once #include "../Mapper.h" #include "IConditionMapper.h" -#include "cru/common/Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/Base.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/Condition.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.h b/include/cru/ui/mapper/style/StyleRuleMapper.h index 21bf3176..7430274c 100644 --- a/include/cru/ui/mapper/style/StyleRuleMapper.h +++ b/include/cru/ui/mapper/style/StyleRuleMapper.h @@ -1,7 +1,7 @@ #pragma once #include "../Mapper.h" -#include "cru/common/Base.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/Base.h" +#include "cru/base/ClonablePtr.h" #include "cru/ui/style/StyleRule.h" #include "cru/xml/XmlNode.h" diff --git a/include/cru/ui/model/IListChangeNotify.h b/include/cru/ui/model/IListChangeNotify.h index a9fcd65b..0cbd25f2 100644 --- a/include/cru/ui/model/IListChangeNotify.h +++ b/include/cru/ui/model/IListChangeNotify.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" namespace cru::ui::model { enum ListChangeType { diff --git a/include/cru/ui/render/CanvasRenderObject.h b/include/cru/ui/render/CanvasRenderObject.h index f498c5ae..dfe8f090 100644 --- a/include/cru/ui/render/CanvasRenderObject.h +++ b/include/cru/ui/render/CanvasRenderObject.h @@ -1,7 +1,7 @@ #pragma once #include "RenderObject.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" namespace cru::ui::render { class CanvasPaintEventArgs { diff --git a/include/cru/ui/render/MeasureRequirement.h b/include/cru/ui/render/MeasureRequirement.h index ace52ef6..3f4e0a3d 100644 --- a/include/cru/ui/render/MeasureRequirement.h +++ b/include/cru/ui/render/MeasureRequirement.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" -#include "cru/common/String.h" +#include "cru/base/String.h" #include <algorithm> #include <limits> diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h index 8a0ba511..7ab62446 100644 --- a/include/cru/ui/render/RenderObject.h +++ b/include/cru/ui/render/RenderObject.h @@ -2,7 +2,7 @@ #include "../Base.h" #include "MeasureRequirement.h" -#include "cru/common/String.h" +#include "cru/base/String.h" namespace cru::ui::render { struct BoxConstraint { diff --git a/include/cru/ui/render/ScrollBar.h b/include/cru/ui/render/ScrollBar.h index 20b6e6cf..45f80389 100644 --- a/include/cru/ui/render/ScrollBar.h +++ b/include/cru/ui/render/ScrollBar.h @@ -1,6 +1,6 @@ #pragma once -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" #include "cru/platform/graphics/Base.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Geometry.h" diff --git a/include/cru/ui/render/ScrollRenderObject.h b/include/cru/ui/render/ScrollRenderObject.h index 44656942..180e927a 100644 --- a/include/cru/ui/render/ScrollRenderObject.h +++ b/include/cru/ui/render/ScrollRenderObject.h @@ -2,7 +2,7 @@ #include "SingleChildRenderObject.h" #include "ScrollBar.h" -#include "cru/common/Event.h" +#include "cru/base/Event.h" #include "cru/ui/render/RenderObject.h" #include <memory> diff --git a/include/cru/ui/style/Condition.h b/include/cru/ui/style/Condition.h index 28f42315..2d2dceac 100644 --- a/include/cru/ui/style/Condition.h +++ b/include/cru/ui/style/Condition.h @@ -1,8 +1,8 @@ #pragma once #include "../Base.h" -#include "cru/common/Base.h" -#include "cru/common/ClonablePtr.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/ClonablePtr.h" +#include "cru/base/Event.h" #include "cru/ui/controls/IClickableControl.h" #include "cru/ui/helper/ClickDetector.h" diff --git a/include/cru/ui/style/StyleRule.h b/include/cru/ui/style/StyleRule.h index 27069930..1ae2f0f1 100644 --- a/include/cru/ui/style/StyleRule.h +++ b/include/cru/ui/style/StyleRule.h @@ -2,7 +2,7 @@ #include "../Base.h" #include "Condition.h" #include "Styler.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include <memory> #include <vector> diff --git a/include/cru/ui/style/StyleRuleSet.h b/include/cru/ui/style/StyleRuleSet.h index 080c2eb8..fae9ab5f 100644 --- a/include/cru/ui/style/StyleRuleSet.h +++ b/include/cru/ui/style/StyleRuleSet.h @@ -1,7 +1,7 @@ #pragma once #include "StyleRule.h" -#include "cru/common/Base.h" -#include "cru/common/Event.h" +#include "cru/base/Base.h" +#include "cru/base/Event.h" #include "cru/ui/model/IListChangeNotify.h" #include <cstddef> diff --git a/include/cru/ui/style/Styler.h b/include/cru/ui/style/Styler.h index 7df3e138..3ed85e1e 100644 --- a/include/cru/ui/style/Styler.h +++ b/include/cru/ui/style/Styler.h @@ -1,7 +1,7 @@ #pragma once #include "../Base.h" #include "ApplyBorderStyleInfo.h" -#include "cru/common/ClonablePtr.h" +#include "cru/base/ClonablePtr.h" #include "cru/platform/graphics/Brush.h" #include "cru/platform/gui/Cursor.h" #include "cru/ui/render/MeasureRequirement.h" |