/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
}
KeyEvent::KeyEvent( const std::string& keyName, const std::string& keyString, int keyCode, int keyModifier,
- unsigned long timeStamp, const State& keyState, const std::string deviceName,
+ unsigned long timeStamp, const State& keyState, const std::string& deviceName,
const DevelDevice::Class::Type deviceClass, const DevelDevice::Subclass::Type deviceSubclass )
: Event( Key ),
keyName( keyName ),
#define __DALI_INTEGRATION_KEY_EVENT_H__
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
int keyModifier,
unsigned long timeStamp,
const State& keyState,
- const std::string deviceName,
+ const std::string& deviceName,
const DevelDevice::Class::Type deviceClass,
const DevelDevice::Subclass::Type deviceSubclass );
}
}
-Vector2 Actor::ApplySizeSetPolicy( const Vector2 size )
+Vector2 Actor::ApplySizeSetPolicy( const Vector2& size )
{
switch( mRelayoutData->sizeSetPolicy )
{
SetNegotiatedSize( container );
// Negotiate down to children
- const Vector2 newBounds = mTargetSize.GetVectorXY();
-
for( unsigned int i = 0, count = GetChildCount(); i < count; ++i )
{
ActorPtr child = GetChildAt( i );
// Only relayout if required
if( child->RelayoutRequired() )
{
- container.Add( Dali::Actor( child.Get() ), newBounds );
+ container.Add( Dali::Actor( child.Get() ), mTargetSize.GetVectorXY() );
}
}
DALI_LOG_TIMER_END( NegSizeTimer1, gLogRelayoutFilter, Debug::Concise, "NegotiateSize() took: ");
* @param[in] size The size to apply the policy to
* @return Return the adjusted size
*/
- Vector2 ApplySizeSetPolicy( const Vector2 size );
+ Vector2 ApplySizeSetPolicy( const Vector2& size );
/**
* Retrieve the parent object of an Actor.
}
else
{
- while( t >= mProgress[min] && min < valueCount-1 )
+ while( ( min < valueCount-1 )&&( t >= mProgress[min] ) )
{
min++;
}
min--;
max = min+1;
- if( min >= valueCount-1)
+ if( min >= valueCount-1 )
{
min = max = valueCount-1;
tLocal = 0.0f;
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
void KeyEventProcessor::ProcessKeyEvent(const Integration::KeyEvent& event)
{
- bool consumed = false;
KeyEvent keyEvent(event.keyName, event.keyString, event.keyCode, event.keyModifier, event.time, static_cast<Dali::KeyEvent::State>(event.state));
GetImplementation( &keyEvent )->SetDeviceName( event.deviceName );
GetImplementation( &keyEvent )->SetDeviceSubclass( event.deviceSubclass );
// Emit the key event signal from stage.
- consumed = mStage.EmitKeyEventGeneratedSignal( keyEvent );
+ bool consumed = mStage.EmitKeyEventGeneratedSignal( keyEvent );
if( !consumed )
{
// Setup the color buffer based on the RenderMode.
context.ColorMask( renderMode == RenderMode::COLOR );
- return;
- break; // Break statement for consistency (although return will be called instead).
+ break;
}
case RenderMode::STENCIL:
// CLASS HEADER
#include <dali/internal/render/renderers/render-texture.h>
+// EXTERNAL INCLUDES
+#include <math.h> //floor, log2
+
// INTERNAL INCLUDES
#include <dali/devel-api/images/pixel-devel.h>
#include <dali/devel-api/images/native-image-interface-extension.h>
-// EXTERNAL INCLUDES
-#include <math.h> //floor, log2
-
namespace Dali
{
namespace Internal
#include <string>
// INTERNAL INCLUDES
+#include <dali/public-api/images/image-operations.h> // Dali::ImageDimensions
#include <dali/public-api/rendering/sampler.h>
#include <dali/public-api/rendering/texture.h>
#include <dali/internal/event/rendering/texture-impl.h>
#define __DALI_INTERNAL_SCENE_GRAPH_PAN_GESTURE_H__
/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
state = rhs.state;
local = rhs.local;
screen = rhs.screen;
+ read = rhs.read;
}
return *this;