projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates following canvas-renderer devel header location change
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
canvas-view
/
canvas-view-impl.h
diff --git
a/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
b/dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
index
ffc204e
..
92110f0
100644
(file)
--- a/
dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
+++ b/
dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_CANVAS_VIEW_H
/*
#define DALI_TOOLKIT_INTERNAL_CANVAS_VIEW_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,9
+19,9
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer
/canvas-renderer
-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer
/canvas-renderer
-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer
/canvas-renderer
.h>
#include <dali/devel-api/rendering/renderer-devel.h>
#include <dali/integration-api/processor-interface.h>
#include <dali/devel-api/rendering/renderer-devel.h>
#include <dali/integration-api/processor-interface.h>
@@
-79,6
+79,16
@@
public:
*/
static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
*/
static Property::Value GetProperty(BaseObject* object, Property::Index propertyIndex);
+ /**
+ * @copydoc Toolkit::Control::CanvasView::RemoveDrawable
+ */
+ bool RemoveDrawable(Dali::CanvasRenderer::Drawable& drawable);
+
+ /**
+ * @copydoc Toolkit::Control::CanvasView::RemoveAllDrawables
+ */
+ bool RemoveAllDrawables();
+
private: // From Control
/**
* @copydoc Control::OnRelayout
private: // From Control
/**
* @copydoc Control::OnRelayout
@@
-125,9
+135,9
@@
public:
/**
* @bried Apply the rasterized image to the canvas view
*
/**
* @bried Apply the rasterized image to the canvas view
*
- * @param[in] rasterized
PixelData The pixel buffer
with the rasterized pixels
+ * @param[in] rasterized
Texture The texture
with the rasterized pixels
*/
*/
- void ApplyRasterizedImage(
PixelData rasterizedPixelData
);
+ void ApplyRasterizedImage(
Texture rasterizedTexture
);
private:
CanvasView(const CanvasView&) = delete;
private:
CanvasView(const CanvasView&) = delete;