Tizen::Ui::AccessibilityElement* _pAccessibilityElement;
Tizen::Io::FileEventManager* _pFileEventManager;
Tizen::Graphics::Point _currentPoint;
+ Tizen::Graphics::Point _storedExposurePositionPortrait;
+ Tizen::Graphics::Point _storedExposurePositionLandscape;
};
#endif
<Privileges>
<Privilege>http://tizen.org/privilege/content.read</Privilege>
<Privilege>http://tizen.org/privilege/location</Privilege>
- <Privilege>http://tizen.org/privilege/videorecorder</Privilege>
<Privilege>http://tizen.org/privilege/alarm</Privilege>
- <Privilege>http://tizen.org/privilege/application.launch</Privilege>
+ <Privilege>http://tizen.org/privilege/videorecorder</Privilege>
<Privilege>http://tizen.org/privilege/camera</Privilege>
+ <Privilege>http://tizen.org/privilege/application.launch</Privilege>
<Privilege>http://tizen.org/privilege/power</Privilege>
<Privilege>http://tizen.org/privilege/content.write</Privilege>
- <Privilege>http://tizen.org/privilege/telephonymanager</Privilege>
- <Privilege>http://tizen.org/privilege/systeminfo</Privilege>
</Privileges>
<UiApp HwAcceleration="On" LaunchingHistoryVisible="True" Main="True" MenuIconVisible="True" Name="Camera" SubMode="True">
<UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>
</AppControl>
</AppControls>
<LaunchConditions/>
- <Notifications>
- <Notification Name="Ticker">On</Notification>
- <Notification Name="Sound">On</Notification>
- <Notification Name="Contents">Off</Notification>
- <Notification Name="Badge">On</Notification>
- </Notifications>
</UiApp>
</Apps>
</Manifest>
,_pAccessibilityElement(null)
, _pFileEventManager(null)
,_currentPoint(0,0)
+,_storedExposurePositionPortrait(0,0)
+,_storedExposurePositionLandscape(0,0)
{
//empty Implementation
}
if (storageType == STORAGE_TYPE_PHONE)
{
r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, storageType);
- TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+ TryReturnVoid(r == E_SUCCESS, "Failed to set value to registry[%s]", GetErrorMessage(r));
_pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
}
else if (storageType == STORAGE_TYPE_MEMORYCARD)
{
AppLogDebug("StorageCard mount");
r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, storageType);
- TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+ TryReturnVoid(r == E_SUCCESS, "Failed to set value to registry[%s]", GetErrorMessage(r));
_pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_MOUNT);
}
else
AppLogDebug("EXIT");
}
+void
+BaseForm::ShowMemoryFullPopup(void)
+{
+ AppLogDebug("ENTER");
+ int modalResult = 0;
+ MessageBox msgBox;
+ AppResource* pAppResource = null;
+ String memoryLowTitle;
+ String memoryLowMessage;
+ result r = E_SUCCESS;
+
+ pAppResource = Application::GetInstance()->GetAppResource();
+ TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
+
+ pAppResource->GetString(L"IDS_COM_POP_MEMORY_FULL", memoryLowTitle);
+ pAppResource->GetString(L"IDS_COM_POP_MEMORY_FULL", memoryLowMessage);
+
+ r = msgBox.Construct(memoryLowTitle, memoryLowMessage, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+ TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
+ msgBox.ShowAndWait(modalResult);
+
+ switch (modalResult)
+ {
+ case MSGBOX_RESULT_CLOSE:
+ {
+ AppLogDebug("MSGBOX_RESULT_CLOSE");
+ _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+
+ if (CameraPresentationModel::GetInstance()->IsStorageCardMounted() != true )
+ r = TerminateApp();
+ AppLogDebug("TerminateApp Result[%s]", GetErrorMessage(r));
+ }
+ break;
+
+ default:
+ break;
+ }
+ AppLogDebug("EXIT");
+}
+
result
BaseForm::TerminateApp(void)
{
}
-void
-BaseForm::ShowMemoryFullPopup(void)
-{
- AppLogDebug("ENTER");
- int modalResult = 0;
- MessageBox msgBox;
- AppResource* pAppResource = null;
- String memoryLowTitle;
- String memoryLowMessage;
- result r = E_SUCCESS;
-
- pAppResource = Application::GetInstance()->GetAppResource();
- TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
-
- pAppResource->GetString(L"IDS_COM_POP_MEMORY_FULL", memoryLowTitle);
- pAppResource->GetString(L"IDS_COM_POP_MEMORY_FULL", memoryLowMessage);
-
-
- r = msgBox.Construct(memoryLowTitle, memoryLowMessage, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
- TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
- msgBox.ShowAndWait(modalResult);
-
- switch (modalResult)
- {
- case MSGBOX_RESULT_CLOSE:
- {
- AppLogDebug("MSGBOX_RESULT_CLOSE");
- _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
-
- if (CameraPresentationModel::GetInstance()->IsStorageCardMounted() != true )
- r = TerminateApp();
- AppLogDebug("TerminateApp Result[%s]", GetErrorMessage(r));
- }
- break;
-
- default:
- break;
- }
- AppLogDebug("EXIT");
-}
-
bool
BaseForm::OnKeyPressed (Control &source, const KeyEventInfo &keyEventInfo)
{
void
BaseForm::HideExposurePanel(void)
{
-
_closeTimerValue = 0;
if (_pExposureCloseTimer)
static const int UNIT_THOUSAND = 1000;
static const int X_SUBMENU_TIMER_MODE_PANEL = 340;
-static const int Y_SUBMENU_TIMER_MODE_PANEL = 120;
+static const int Y_SUBMENU_TIMER_MODE_PANEL = 195;
static const int W_SUBMENU_TIMER_MODE_PANEL = 460;
static const int H_SUBMENU_TIMER_MODE_PANEL = 445;
delete pBitmapRotate;
pBitmapRotate = null;
- pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMCODER_STANDBY_SHUTTER_NORMAL);
- TryCatch(pBitmap != null, r = E_SYSTEM, "pBitmap is null");
-
- pBitmapRotate = RotationImageN(pBitmap, rotationType);
- TryCatch(pBitmapRotate != null, r = E_SYSTEM, "RecordButton::pBitmapRotate is null");
-
- __pRecordButton->SetDisabledBackgroundBitmap(*pBitmapRotate);
- delete pBitmap;
- pBitmap = null;
-
- delete pBitmapRotate;
- pBitmapRotate = null;
-
pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_THUMBNAIL_BG);
TryCatch(pBitmap != null, r = E_SYSTEM, "ThumbnailButton::pBitmap is null");
{
step = W_EXPOSURE_PANEL_SLIDER_PORTRAIT / MAX_CAMERA_EXPOSURE_VALUE;
- buttonPosition.x = (step * (MAX_CAMERA_EXPOSURE_VALUE - exposure)) + X_EXPOSURE_PANEL_SLIDER_PORTRAIT;
+ AppLogDebug("Exposure value is %d",exposure);
+
+ if (_storedExposurePositionPortrait.x == 0)
+ {
+ buttonPosition.x = (step * (MAX_CAMERA_EXPOSURE_VALUE - exposure)) + X_EXPOSURE_PANEL_SLIDER_PORTRAIT;
+ }
+ else
+ {
+ buttonPosition.x = _storedExposurePositionPortrait.x;
+ }
+
buttonPosition.y = Y_EXPOSURE_PANEL_SLIDER_PORTRAIT;
AppLogDebug("DrawExposureSlider X Point %d", buttonPosition.x);
}
step = H_EXPOSURE_PANEL_SLIDER_LANDSCAPE / MAX_CAMERA_EXPOSURE_VALUE;
buttonPosition.x = X_EXPOSURE_PANEL_SLIDER_LANDSCAPE;
- buttonPosition.y = (step * exposure) + Y_EXPOSURE_PANEL_SLIDER_LANDSCAPE;
+
+ if (_storedExposurePositionLandscape.y == 0)
+ {
+ buttonPosition.y = (step * exposure) + Y_EXPOSURE_PANEL_SLIDER_LANDSCAPE;
+ }
+ else
+ {
+ buttonPosition.y = _storedExposurePositionLandscape.y;
+ }
+
AppLogDebug("DrawExposureSlider Y Point %d", buttonPosition.y);
}
r = DrawExposureSlider(buttonPosition, DRAW_INITIALIZED);
TryCatch(r == E_SUCCESS, , "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
+ AppLogDebug("point is %d %d",_currentPoint.x,_currentPoint.y);
AppLogDebug("EXIT");
return r;
result r = E_SUCCESS;
Point buttonPosition;
Rectangle rectSlider;
- float adjustedXvalue = 0;
- int adjustedXinInt = 0;
- static int lastKnowButtonPosition = 0;
bool isSliderRectValid = false;
Rectangle clientAreaRect;
{
case DRAW_INITIALIZED:
{
- buttonPosition.x = currentPosition.x - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+ if (_storedExposurePositionPortrait.x == 0)
+ {
+ buttonPosition.x = currentPosition.x - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+ }
+ else
+ {
+ buttonPosition.x = currentPosition.x;
+ }
buttonPosition.y = currentPosition.y;
isSliderRectValid = true;
}
AppLogDebug("button x= %d , y=%d",buttonPosition.x,buttonPosition.y);
- adjustedXvalue = (float)buttonPosition.x - X_EXPOSURE_PANEL_SLIDER_PORTRAIT;
- adjustedXinInt = buttonPosition.x - X_EXPOSURE_PANEL_SLIDER_PORTRAIT;
-
- adjustedXvalue = adjustedXvalue / BRIGHTNESS_DIVIDER_PORTRAIT_MODE;
- adjustedXinInt = adjustedXinInt/ BRIGHTNESS_DIVIDER_PORTRAIT_MODE;
-
- if ((adjustedXvalue - adjustedXinInt) != 0)
- {
- adjustedXinInt = adjustedXinInt+1;
- }
-
- adjustedXinInt = BRIGHTNESS_DIVIDER_PORTRAIT_MODE*adjustedXinInt;
-
- buttonPosition.x = X_EXPOSURE_PANEL_SLIDER_PORTRAIT + adjustedXinInt;
-
- /*if ( buttonPosition.x >= (rectSlider.x + rectSlider.width) )
- {
- buttonPosition.x = (rectSlider.x + rectSlider.width) - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
-
- AppLogDebug("updated button x poitn is %d %d",buttonPosition.x, (rectSlider.x + rectSlider.width));
- r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
- TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
- }
- else if ( buttonPosition.x < rectSlider.x )
- buttonPosition.x = rectSlider.x - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
- else*/
- {
- AppLogDebug("updated button x poitn is %d %d",buttonPosition.x, (rectSlider.x + rectSlider.width));
- r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
- TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
- }
+ _storedExposurePositionPortrait.x = buttonPosition.x;
+ _storedExposurePositionPortrait.y = buttonPosition.y;
+ AppLogDebug("updated button x poitn is %d %d",buttonPosition.x, (rectSlider.x + rectSlider.width));
+ r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
+ TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
}
}
else
case DRAW_INITIALIZED:
{
buttonPosition.x = currentPosition.x;
- buttonPosition.y = currentPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+
+ if (_storedExposurePositionLandscape.y == 0)
+ {
+ buttonPosition.y = currentPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+ }
+ else
+ {
+ buttonPosition.y = currentPosition.y;
+ }
isSliderRectValid = true;
}
break;
buttonPosition.x = rectSlider.x;
isSliderRectValid = true;
+ _storedExposurePositionLandscape.x = buttonPosition.x;
+ _storedExposurePositionLandscape.y = buttonPosition.y;
+
AppLogDebug("updated button Y point is %d %d",buttonPosition.y, (rectSlider.y + rectSlider.height ));
r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
}
- lastKnowButtonPosition = buttonPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
}
else
{
buttonPosition.x = rectSlider.x;
- buttonPosition.y = lastKnowButtonPosition;
isSliderRectValid = false;
}
}
r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
}
- lastKnowButtonPosition = buttonPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
}
else
{
buttonPosition.x = rectSlider.x;
- buttonPosition.y = lastKnowButtonPosition;
isSliderRectValid = false;
}
if (remainedNum == STORAGE_VALUE_ZERO)
{
- ShowMemoryFullPopup();
DoStopRecording();
+ ShowMemoryFullPopup();
+ __recorderStopped = true;
}
else
{
W_SETTING_MENU_CONTESTS-6, H_SETTING_MENU_CONTESTS);
Rectangle rectContentsValue = Rectangle(X_SETTING_MENU_CONTENTS_VALUE+19, Y_SETTING_MENU_CONTENTS_VALUE,
- W_SETTING_MENU_CONTENTS_VALUE - 47, H_SETTING_MENU_CONTENTS_VALUE);
+ W_SETTING_MENU_CONTENTS_VALUE - 50, H_SETTING_MENU_CONTENTS_VALUE);
String arrRegStringSupporExposure[] =
{
TIMER_INTERVAL,
static const int X_SUBMENU_PANEL_START_LANDSCAPE = 340;
static const int Y_SUBMENU_PANEL_OFFSET_PORTRAIT = 150;
static const int X_SUBMENU_TIMER_MODE_PANEL = 340;
-static const int Y_SUBMENU_TIMER_MODE_PANEL = 120;
+static const int Y_SUBMENU_TIMER_MODE_PANEL = 195;
static const int W_SUBMENU_TIMER_MODE_PANEL = 460;
static const int H_SUBMENU_TIMER_MODE_PANEL = 445;
static const int X_SUBMENU_TIMER_MODE_LIST = 20;
bool isCharging = false;
BatteryLevel batteryLevel;
-
-
if (__pSwButton != NULL)
{
__pSwButton->SetFocusable(true);
if (__dir == ORIENTATION_STATUS_PORTRAIT
|| __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
{
- r = DrawExposureSlider();
+ r = DrawExposureSlider(currentPosition, DRAW_RELEASED);
_closeTimerValue = UNIT_VALUE_ZERO;
TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
case SETTING_TIMER_CAPTURE_2_SEC:
{
- _pIntervalValueTimer->Cancel();
+ if (_pIntervalValueTimer != null)
+ {
+ _pIntervalValueTimer->Cancel();
+ }
r = _pIntervalValueTimer->Start(CAMERA_TIMER_2_SEC);
TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
case SETTING_TIMER_CAPTURE_5_SEC:
{
- _pIntervalValueTimer->Cancel();
+ if (_pIntervalValueTimer != null)
+ {
+ _pIntervalValueTimer->Cancel();
+ }
r = _pIntervalValueTimer->Start(CAMERA_TIMER_5_SEC);
TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
case SETTING_TIMER_CAPTURE_10_SEC:
{
- _pIntervalValueTimer->Cancel();
+ if (_pIntervalValueTimer != null)
+ {
+ _pIntervalValueTimer->Cancel();
+ }
+
+
r = _pIntervalValueTimer->Start(CAMERA_TIMER_10_SEC);
TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
AppLogDebug("Exposure value is %d",exposure);
- buttonPosition.x = (step * (MAX_CAMERA_EXPOSURE_VALUE - exposure)) + rectSlider.x;
+ if (_storedExposurePositionPortrait.x == 0)
+ {
+ buttonPosition.x = (step * (MAX_CAMERA_EXPOSURE_VALUE - exposure)) + rectSlider.x;
+ }
+ else
+ {
+ buttonPosition.x = _storedExposurePositionPortrait.x;
+ }
+
buttonPosition.y = rectSlider.y;
AppLogDebug("DrawExposureSlider X Point %d", buttonPosition.x);
}
step = rectSlider.height / MAX_CAMERA_EXPOSURE_VALUE;
buttonPosition.x = rectSlider.x;
- buttonPosition.y = (step * exposure) + rectSlider.y;
+
+ if (_storedExposurePositionLandscape.y == 0)
+ {
+ buttonPosition.y = (step * exposure) + rectSlider.y;
+ }
+ else
+ {
+ buttonPosition.y = _storedExposurePositionLandscape.y;
+ }
+
AppLogDebug("DrawExposureSlider Y Point %d", buttonPosition.y);
}
result r = E_SUCCESS;
Point buttonPosition;
Rectangle rectSlider;
- float adjustedXvalue = 0;
int adjustedXinInt = 0;
- static int lastKnowButtonPosition = 0;
bool IsSliderRectValid = false;
{
case DRAW_INITIALIZED:
{
- buttonPosition.x = currentPosition.x - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+ if (_storedExposurePositionPortrait.x == 0)
+ {
+ buttonPosition.x = currentPosition.x - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+ }
+ else
+ {
+ buttonPosition.x = currentPosition.x;
+ }
buttonPosition.y = currentPosition.y;
IsSliderRectValid = true;
}
AppLogDebug("button x= %d , y=%d",buttonPosition.x,buttonPosition.y);
- adjustedXvalue = (float)buttonPosition.x - X_EXPOSURE_PANEL_SIDER_PORTRAIT;
adjustedXinInt = buttonPosition.x - X_EXPOSURE_PANEL_SIDER_PORTRAIT;
-
- adjustedXvalue = adjustedXvalue / BRIGHTNESS_DIVIDER_PORTRAIT_MODE;
- adjustedXinInt = adjustedXinInt/ BRIGHTNESS_DIVIDER_PORTRAIT_MODE;
-
- if ((adjustedXvalue - adjustedXinInt) != 0)
- {
- adjustedXinInt = adjustedXinInt+1;
- }
-
- adjustedXinInt = BRIGHTNESS_DIVIDER_PORTRAIT_MODE*adjustedXinInt;
-
buttonPosition.x = X_EXPOSURE_PANEL_SIDER_PORTRAIT + adjustedXinInt;
- /*if ( buttonPosition.x >= (rectSlider.x + rectSlider.width) )
- {
- buttonPosition.x = (rectSlider.x + rectSlider.width) - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
-
- AppLogDebug("updated button x poitn is %d %d",buttonPosition.x, (rectSlider.x + rectSlider.width));
- r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
- TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
- }
- else if ( buttonPosition.x < rectSlider.x )
- buttonPosition.x = rectSlider.x - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
- else*/
- {
- AppLogDebug("updated button x poitn is %d %d",buttonPosition.x, (rectSlider.x + rectSlider.width));
- r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
- TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
- }
+ _storedExposurePositionPortrait.x = buttonPosition.x;
+ _storedExposurePositionPortrait.y = buttonPosition.y;
+ AppLogDebug("updated button x poitn is %d %d",buttonPosition.x, (rectSlider.x + rectSlider.width));
+ r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
+ TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
}
}
else
else
{
buttonPosition.x = rectSlider.x;
- //buttonPosition.y = rectSlider.y;
+ buttonPosition.y = rectSlider.y;
IsSliderRectValid = true;
}
case DRAW_INITIALIZED:
{
buttonPosition.x = currentPosition.x;
- buttonPosition.y = currentPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+
+ if (_storedExposurePositionLandscape.y == 0)
+ {
+ buttonPosition.y = currentPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
+ }
+ else
+ {
+ buttonPosition.y = currentPosition.y;
+ }
IsSliderRectValid = true;
}
break;
buttonPosition.x = rectSlider.x;
IsSliderRectValid = true;
+ _storedExposurePositionLandscape.x = buttonPosition.x;
+ _storedExposurePositionLandscape.y = buttonPosition.y;
+
AppLogDebug("updated button Y point is %d %d",buttonPosition.y, (rectSlider.y + rectSlider.height ));
r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
}
- lastKnowButtonPosition = buttonPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
}
else
{
buttonPosition.x = rectSlider.x;
- buttonPosition.y = lastKnowButtonPosition;
- IsSliderRectValid = false;
+ IsSliderRectValid = true;
}
}
break;
r = SetSliderAdjustValue(buttonPosition, rectSlider, EXPOSURE_VALUE, MAX_CAMERA_EXPOSURE_VALUE);
TryCatch(r == E_SUCCESS, , "SliderAdjustValue() fail[%s]", GetErrorMessage(r));
}
- else
- {
- if (currentPosition.y < clientAreaRect.y)
- {
- buttonPosition.y = currentPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
- }
- else if (currentPosition.y > rectSlider.y + rectSlider.height)
- {
- buttonPosition.y = (rectSlider.y + rectSlider.height) - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
- }
- }
- lastKnowButtonPosition = buttonPosition.y - OFFSET_EXPOSURE_PANEL_SLIDER_BUTTON;
}
else
{
buttonPosition.x = rectSlider.x;
- buttonPosition.y = lastKnowButtonPosition;
- IsSliderRectValid = false;
-
- AppLogDebug("Button Position [%d] [%d] ",buttonPosition.x, buttonPosition.y);
+ IsSliderRectValid = true;
}
if ((buttonPosition.y % FRAME_SKIP) != INDEX_UNIT_ZERO)
W_SETTING_MENU_CONTESTS -6, H_SETTING_MENU_CONTESTS);
Rectangle rectContentsValue = Rectangle(X_SETTING_MENU_CONTENTS_VALUE +19, Y_SETTING_MENU_CONTENTS_VALUE,
- W_SETTING_MENU_CONTENTS_VALUE - 47, H_SETTING_MENU_CONTENTS_VALUE);
+ W_SETTING_MENU_CONTENTS_VALUE - 50, H_SETTING_MENU_CONTENTS_VALUE);
int selfPortraitEnable = 0;
String strTmp = L"";
_pCameraPresentationModel->SetIntervalTimerRun(false);
_isUsedTimerCaptured = false;
+ if (_pCaptureStartTimer != null)
+ {
+ _pCaptureStartTimer->Cancel();
+ }
+
if (_pIntervalValueTimer != null)
{
_pIntervalValueTimer->Cancel();
projects / apps / native / preloaded / Camera.git / commitdiff
