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
Dali-Text: Keyboard Shortcuts
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
visual-model-impl.cpp
diff --git
a/dali-toolkit/internal/text/visual-model-impl.cpp
b/dali-toolkit/internal/text/visual-model-impl.cpp
index
bd567a4
..
6a06e58
100755
(executable)
--- a/
dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/
dali-toolkit/internal/text/visual-model-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-373,7
+373,7
@@
void VisualModel::SetUnderlineHeight( float height )
mUnderlineHeight = height;
}
mUnderlineHeight = height;
}
-void VisualModel::SetOutlineWidth( u
nsigned in
t width )
+void VisualModel::SetOutlineWidth( u
int16_
t width )
{
mOutlineWidth = width;
}
{
mOutlineWidth = width;
}
@@
-428,7
+428,7
@@
float VisualModel::GetUnderlineHeight() const
return mUnderlineHeight;
}
return mUnderlineHeight;
}
-u
nsigned in
t VisualModel::GetOutlineWidth() const
+u
int16_
t VisualModel::GetOutlineWidth() const
{
return mOutlineWidth;
}
{
return mOutlineWidth;
}
@@
-469,12
+469,12
@@
VisualModel::VisualModel()
mShadowColor( Color::BLACK ),
mUnderlineColor( Color::BLACK ),
mOutlineColor( Color::WHITE ),
mShadowColor( Color::BLACK ),
mUnderlineColor( Color::BLACK ),
mOutlineColor( Color::WHITE ),
- mBackgroundColor( Color::
CYAN
),
+ mBackgroundColor( Color::
TRANSPARENT
),
mControlSize(),
mShadowOffset(),
mUnderlineHeight( 0.0f ),
mControlSize(),
mShadowOffset(),
mUnderlineHeight( 0.0f ),
- mOutlineWidth( 0u ),
mShadowBlurRadius( 0.0f ),
mShadowBlurRadius( 0.0f ),
+ mOutlineWidth( 0u ),
mNaturalSize(),
mLayoutSize(),
mCachedLineIndex( 0u ),
mNaturalSize(),
mLayoutSize(),
mCachedLineIndex( 0u ),