From 64dae98d61a31896636c44e78418de12db11559f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 7 May 2015 11:10:28 +0200 Subject: [PATCH] ccomponents: add missing slash to iconBasePath Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e85f32848c5b5714c9158ae110de25446a1dacd7 Author: vanhofen Date: 2015-05-07 (Thu, 07 May 2015) Origin message was: ------------------ - ccomponents: add missing slash to iconBasePath --- src/gui/components/cc_frm_button.cpp | 2 +- src/gui/components/cc_frm_scrollbar.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp index 0d5a3ed17..92c193c1f 100644 --- a/src/gui/components/cc_frm_button.cpp +++ b/src/gui/components/cc_frm_button.cpp @@ -149,7 +149,7 @@ void CComponentsButton::initIcon() string::size_type pos = cc_btn_icon.find("/", 0); if (pos == string::npos) - cc_btn_icon = frameBuffer->getIconBasePath() + cc_btn_icon + ".png"; + cc_btn_icon = frameBuffer->getIconBasePath() + "/" + cc_btn_icon + ".png"; cc_btn_icon_obj = new CComponentsPicture(fr_thickness, y_icon, cc_btn_icon, this); h_icon = cc_btn_icon_obj->getHeight(); diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp index 0e4bfed7e..464c50388 100644 --- a/src/gui/components/cc_frm_scrollbar.cpp +++ b/src/gui/components/cc_frm_scrollbar.cpp @@ -81,8 +81,8 @@ void CComponentsScrollBar::initVarSbForm(const int& count) sb_segments_obj = NULL; string ftype = ".png"; - sb_up_icon = frameBuffer->getIconBasePath() + NEUTRINO_ICON_BUTTON_TOP + ftype; - sb_down_icon = frameBuffer->getIconBasePath() + NEUTRINO_ICON_BUTTON_DOWN + ftype; + sb_up_icon = frameBuffer->getIconBasePath() + "/" + NEUTRINO_ICON_BUTTON_TOP + ftype; + sb_down_icon = frameBuffer->getIconBasePath() + "/" + NEUTRINO_ICON_BUTTON_DOWN + ftype; sb_segments_count = count; sb_mark_id = 0;