//
//------------------------------------------------------------------------------
-#include "dali.h"
+#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/public-api/builder/builder.h>
-#include <dali-toolkit/public-api/builder/tree-node.h>
-#include <dali-toolkit/public-api/builder/json-parser.h>
+#include <dali-toolkit/devel-api/builder/builder.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
+#include <dali-toolkit/devel-api/builder/json-parser.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <map>
#include <string>
#include <fstream>
#include "sys/stat.h"
#include <ctime>
+#include <cstring>
#include <dali/integration-api/debug.h>
#include "shared/view.h"
'stage': \
[ \
{ \
- 'type':'TextView', \
+ 'type':'TextLabel', \
'size': [50,50,1], \
'parent-origin': 'CENTER', \
'text':'COULD NOT LOAD JSON FILE' \
}
}
-static Vector3 SetItemSize(unsigned int numberOfColumns, float layoutWidth, float sideMargin, float columnSpacing)
-{
- return Vector3(layoutWidth, 50, 1);
-}
-
//------------------------------------------------------------------------------
//
//
void SetTitle(const std::string& title)
{
- // TODO
+ if(!mTitleActor)
+ {
+ mTitleActor = DemoHelper::CreateToolBarLabel( "" );
+ // Add title to the tool bar.
+ mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
+ }
+
+ mTitleActor.SetProperty( TextLabel::Property::TEXT, title );
}
bool OnToolSelectLayout( Toolkit::Button button )
void EnterSelection()
{
Stage stage = Stage::GetCurrent();
+ stage.SetBackgroundColor( Color::WHITE );
mTapDetector = TapGestureDetector::New();
mTapDetector.DetectedSignal().Connect( this, &ExampleApp::OnTap );
stage.Add( mItemView );
mItemView.SetParentOrigin(ParentOrigin::CENTER);
mItemView.SetAnchorPoint(AnchorPoint::CENTER);
- mGridLayout = GridLayout::New();
- mGridLayout->SetNumberOfColumns(1);
+ mLayout = DefaultItemLayout::New( DefaultItemLayout::LIST );
- mGridLayout->SetItemSizeFunction(SetItemSize);
+ mLayout->SetItemSize( Vector3( stage.GetSize().width, 50, 1 ) );
- mGridLayout->SetTopMargin(DemoHelper::DEFAULT_VIEW_STYLE.mToolBarHeight);
+ mItemView.AddLayout( *mLayout );
- mItemView.AddLayout(*mGridLayout);
-
- Vector3 size(stage.GetSize());
- mItemView.ActivateLayout(0, size, 0.0f/*immediate*/);
mItemView.SetKeyboardFocusable( true );
mFiles.clear();
SetTitle("Select");
- // Itemview renderes the previous items unless its scrolled. Not sure why at the moment so we force a scroll
- mItemView.ScrollToItem(0, 0);
-
+ // Activate the layout
+ Vector3 size(stage.GetSize());
+ mItemView.ActivateLayout(0, size, 0.0f/*immediate*/);
}
void ExitSelection()
Actor MenuItem(const std::string& text)
{
- return Actor();
+ TextLabel label = TextLabel::New( ShortName( text ) );
+ label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "builderlabel" );
+ label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+
+ // Hook up tap detector
+ mTapDetector.Attach( label );
+
+ return label;
}
bool OnTimer()
}
builder.AddActors( layer );
-
}
private:
Application& mApp;
- GridLayoutPtr mGridLayout;
+ ItemLayoutPtr mLayout;
ItemView mItemView;
- Toolkit::View mView;
+ Toolkit::Control mView;
unsigned int mOrientation;
Toolkit::ToolBar mToolBar;
+ TextLabel mTitleActor; ///< The Toolbar's Title.
Layer mBuilderLayer;
}
}
- Application app = Application::New(&argc, &argv);
+ Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
ExampleApp dali_app(app);