summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c207c7a)
Fix feedback style error message.
It ocurred because of empty path.
Give default theme path when applying default theme instead of empty path.
Plus, add default-feedback-theme.json to resource package.
Change-Id: I2459cc39a798bf3b86c688275feae8957798bcd9
Signed-off-by: minho.sun <minho.sun@samsung.com>
void StyleManager::ApplyDefaultTheme()
{
void StyleManager::ApplyDefaultTheme()
{
- std::string empty;
- SetTheme( empty );
+ SetTheme( DEFAULT_THEME );
}
const std::string& StyleManager::GetDefaultFontFamily() const
}
const std::string& StyleManager::GetDefaultFontFamily() const
// Always load the default theme first, then merge in the custom theme if present
themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME );
// Always load the default theme first, then merge in the custom theme if present
themeLoaded = LoadJSON( mThemeBuilder, DEFAULT_THEME );
+ mThemeFile = themeFile;
- if( ! themeFile.empty() )
+ if( themeFile.compare(DEFAULT_THEME) != 0 )
- mThemeFile = themeFile;
themeLoaded = LoadJSON( mThemeBuilder, mThemeFile );
}
themeLoaded = LoadJSON( mThemeBuilder, mThemeFile );
}
mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080
cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080
mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080
cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080
+# Copy default feedback theme
+cp dali-toolkit/styles/default-feedback-theme.json %{buildroot}%{dali_toolkit_style_files}
+
##############################
# Post Install
##############################
##############################
# Post Install
##############################
%{dali_toolkit_image_files}/*
%{dali_toolkit_sound_files}/*
%{dali_toolkit_style_files}/480x800/*
%{dali_toolkit_image_files}/*
%{dali_toolkit_sound_files}/*
%{dali_toolkit_style_files}/480x800/*
+%{dali_toolkit_style_files}/default-feedback-theme.json
%{_datadir}/locale/*/LC_MESSAGES/*
%files resources_720x1280
%{_datadir}/locale/*/LC_MESSAGES/*
%files resources_720x1280
%{dali_toolkit_image_files}/*
%{dali_toolkit_sound_files}/*
%{dali_toolkit_style_files}/720x1280/*
%{dali_toolkit_image_files}/*
%{dali_toolkit_sound_files}/*
%{dali_toolkit_style_files}/720x1280/*
+%{dali_toolkit_style_files}/default-feedback-theme.json
%{_datadir}/locale/*/LC_MESSAGES/*
%files resources_1920x1080
%{_datadir}/locale/*/LC_MESSAGES/*
%files resources_1920x1080
%{dali_toolkit_image_files}/*
%{dali_toolkit_sound_files}/*
%{dali_toolkit_style_files}/1920x1080/*
%{dali_toolkit_image_files}/*
%{dali_toolkit_sound_files}/*
%{dali_toolkit_style_files}/1920x1080/*
+%{dali_toolkit_style_files}/default-feedback-theme.json
%{_datadir}/locale/*/LC_MESSAGES/*
%{_datadir}/locale/*/LC_MESSAGES/*