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
Fix the texture bleeding with wrapping in atlas
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
table-view
/
table-view.cpp
diff --git
a/dali-toolkit/public-api/controls/table-view/table-view.cpp
b/dali-toolkit/public-api/controls/table-view/table-view.cpp
index
82e6e10
..
126c254
100644
(file)
--- a/
dali-toolkit/public-api/controls/table-view/table-view.cpp
+++ b/
dali-toolkit/public-api/controls/table-view/table-view.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
@@
-29,10
+29,6
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
-const std::string TableView::CELL_INDICES_PROPERTY_NAME("cell-indices");
-const std::string TableView::ROW_SPAN_PROPERTY_NAME("row-span");
-const std::string TableView::COLUMN_SPAN_PROPERTY_NAME("column-span");
-
TableView::TableView()
{
}
TableView::TableView()
{
}
@@
-137,22
+133,22
@@
Size TableView::GetCellPadding()
void TableView::SetFitHeight( unsigned int rowIndex )
{
void TableView::SetFitHeight( unsigned int rowIndex )
{
- GetImpl(*this).Set
RowPolicy( rowIndex, Internal::TableView::FIT
);
+ GetImpl(*this).Set
FitHeight( rowIndex
);
}
bool TableView::IsFitHeight( unsigned int rowIndex ) const
{
}
bool TableView::IsFitHeight( unsigned int rowIndex ) const
{
- return
( GetImpl(*this).GetRowPolicy( rowIndex ) == Internal::TableView::FIT
);
+ return
GetImpl(*this).IsFitHeight( rowIndex
);
}
void TableView::SetFitWidth( unsigned int columnIndex )
{
}
void TableView::SetFitWidth( unsigned int columnIndex )
{
- GetImpl(*this).Set
ColumnPolicy( columnIndex, Internal::TableView::FIT
);
+ GetImpl(*this).Set
FitWidth( columnIndex
);
}
bool TableView::IsFitWidth( unsigned int columnIndex ) const
{
}
bool TableView::IsFitWidth( unsigned int columnIndex ) const
{
- return
( GetImpl(*this).GetColumnPolicy( columnIndex ) == Internal::TableView::FIT
);
+ return
GetImpl(*this).IsFitWidth( columnIndex
);
}
void TableView::SetFixedHeight( unsigned int rowIndex, float height )
}
void TableView::SetFixedHeight( unsigned int rowIndex, float height )