Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Side by Side Diff: xfa/fwl/core/ifwl_datetimepicker.cpp

Issue 2433133002: Remove IFWL_*::Create methods, use new (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fwl/core/ifwl_datetimepicker.h" 7 #include "xfa/fwl/core/ifwl_datetimepicker.h"
8 8
9 #include "third_party/base/ptr_util.h"
9 #include "xfa/fwl/core/cfwl_message.h" 10 #include "xfa/fwl/core/cfwl_message.h"
10 #include "xfa/fwl/core/cfwl_themebackground.h" 11 #include "xfa/fwl/core/cfwl_themebackground.h"
11 #include "xfa/fwl/core/cfwl_widgetmgr.h" 12 #include "xfa/fwl/core/cfwl_widgetmgr.h"
12 #include "xfa/fwl/core/fwl_noteimp.h" 13 #include "xfa/fwl/core/fwl_noteimp.h"
13 #include "xfa/fwl/core/ifwl_datetimecalendar.h" 14 #include "xfa/fwl/core/ifwl_datetimecalendar.h"
14 #include "xfa/fwl/core/ifwl_datetimeedit.h" 15 #include "xfa/fwl/core/ifwl_datetimeedit.h"
15 #include "xfa/fwl/core/ifwl_formproxy.h" 16 #include "xfa/fwl/core/ifwl_formproxy.h"
16 #include "xfa/fwl/core/ifwl_spinbutton.h" 17 #include "xfa/fwl/core/ifwl_spinbutton.h"
17 #include "xfa/fwl/core/ifwl_themeprovider.h" 18 #include "xfa/fwl/core/ifwl_themeprovider.h"
18 19
19 namespace { 20 namespace {
20 21
21 const int kDateTimePickerWidth = 100; 22 const int kDateTimePickerWidth = 100;
22 const int kDateTimePickerHeight = 20; 23 const int kDateTimePickerHeight = 20;
23 24
24 } // namespace 25 } // namespace
25 26
26 // static
27 IFWL_DateTimePicker* IFWL_DateTimePicker::Create(
28 const CFWL_WidgetImpProperties& properties,
29 IFWL_Widget* pOuter) {
30 return new IFWL_DateTimePicker(properties, pOuter);
31 }
32
33 IFWL_DateTimePicker::IFWL_DateTimePicker( 27 IFWL_DateTimePicker::IFWL_DateTimePicker(
34 const CFWL_WidgetImpProperties& properties, 28 const CFWL_WidgetImpProperties& properties)
35 IFWL_Widget* pOuter) 29 : IFWL_Widget(properties, nullptr),
36 : IFWL_Widget(properties, pOuter),
37 m_iBtnState(1), 30 m_iBtnState(1),
38 m_iYear(-1), 31 m_iYear(-1),
39 m_iMonth(-1), 32 m_iMonth(-1),
40 m_iDay(-1), 33 m_iDay(-1),
41 m_bLBtnDown(FALSE) { 34 m_bLBtnDown(FALSE) {
42 m_rtBtn.Set(0, 0, 0, 0); 35 m_rtBtn.Set(0, 0, 0, 0);
43 } 36 }
44 37
45 IFWL_DateTimePicker::~IFWL_DateTimePicker() {} 38 IFWL_DateTimePicker::~IFWL_DateTimePicker() {}
46 39
(...skipping 11 matching lines...) Expand all
58 return FWL_Error::Indefinite; 51 return FWL_Error::Indefinite;
59 52
60 m_pDelegate = new CFWL_DateTimePickerImpDelegate(this); 53 m_pDelegate = new CFWL_DateTimePickerImpDelegate(this);
61 m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat; 54 m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
62 CFWL_WidgetImpProperties propMonth; 55 CFWL_WidgetImpProperties propMonth;
63 propMonth.m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border; 56 propMonth.m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border;
64 propMonth.m_dwStates = FWL_WGTSTATE_Invisible; 57 propMonth.m_dwStates = FWL_WGTSTATE_Invisible;
65 propMonth.m_pDataProvider = &m_MonthCalendarDP; 58 propMonth.m_pDataProvider = &m_MonthCalendarDP;
66 propMonth.m_pParent = this; 59 propMonth.m_pParent = this;
67 propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider; 60 propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider;
68 m_pMonthCal.reset(IFWL_DateTimeCalendar::Create(propMonth, this)); 61
62 m_pMonthCal = pdfium::MakeUnique<IFWL_DateTimeCalendar>(propMonth, this);
69 m_pMonthCal->Initialize(); 63 m_pMonthCal->Initialize();
70 CFX_RectF rtMonthCal; 64 CFX_RectF rtMonthCal;
71 m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE); 65 m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE);
72 rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height); 66 rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height);
73 m_pMonthCal->SetWidgetRect(rtMonthCal); 67 m_pMonthCal->SetWidgetRect(rtMonthCal);
74 CFWL_WidgetImpProperties propEdit; 68 CFWL_WidgetImpProperties propEdit;
75 propEdit.m_pParent = this; 69 propEdit.m_pParent = this;
76 propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider; 70 propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider;
77 m_pEdit.reset(IFWL_DateTimeEdit::Create(propEdit, this)); 71
72 m_pEdit = pdfium::MakeUnique<IFWL_DateTimeEdit>(propEdit, this);
78 m_pEdit->Initialize(); 73 m_pEdit->Initialize();
79 RegisterEventTarget(m_pMonthCal.get()); 74 RegisterEventTarget(m_pMonthCal.get());
80 RegisterEventTarget(m_pEdit.get()); 75 RegisterEventTarget(m_pEdit.get());
81 return FWL_Error::Succeeded; 76 return FWL_Error::Succeeded;
82 } 77 }
83 78
84 FWL_Error IFWL_DateTimePicker::Finalize() { 79 FWL_Error IFWL_DateTimePicker::Finalize() {
85 if (m_pEdit) { 80 if (m_pEdit) {
86 m_pEdit->Finalize(); 81 m_pEdit->Finalize();
87 } 82 }
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 329
335 void IFWL_DateTimePicker::DrawDropDownButton(CFX_Graphics* pGraphics, 330 void IFWL_DateTimePicker::DrawDropDownButton(CFX_Graphics* pGraphics,
336 IFWL_ThemeProvider* pTheme, 331 IFWL_ThemeProvider* pTheme,
337 const CFX_Matrix* pMatrix) { 332 const CFX_Matrix* pMatrix) {
338 if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_Spin) == 333 if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_Spin) ==
339 FWL_STYLEEXT_DTP_Spin) { 334 FWL_STYLEEXT_DTP_Spin) {
340 CFWL_WidgetImpProperties prop; 335 CFWL_WidgetImpProperties prop;
341 prop.m_dwStyleExes |= FWL_STYLEEXE_SPB_Vert; 336 prop.m_dwStyleExes |= FWL_STYLEEXE_SPB_Vert;
342 prop.m_pParent = this; 337 prop.m_pParent = this;
343 prop.m_rtWidget = m_rtBtn; 338 prop.m_rtWidget = m_rtBtn;
344 IFWL_SpinButton* pSpin = IFWL_SpinButton::Create(prop, this); 339 IFWL_SpinButton* pSpin = new IFWL_SpinButton(prop);
345 pSpin->Initialize(); 340 pSpin->Initialize();
346 } else { 341 } else {
347 CFWL_ThemeBackground param; 342 CFWL_ThemeBackground param;
348 param.m_pWidget = this; 343 param.m_pWidget = this;
349 param.m_iPart = CFWL_Part::DropDownButton; 344 param.m_iPart = CFWL_Part::DropDownButton;
350 param.m_dwStates = m_iBtnState; 345 param.m_dwStates = m_iBtnState;
351 param.m_pGraphics = pGraphics; 346 param.m_pGraphics = pGraphics;
352 param.m_rtPart = m_rtBtn; 347 param.m_rtPart = m_rtBtn;
353 if (pMatrix) { 348 if (pMatrix) {
354 param.m_matrix.Concat(*pMatrix); 349 param.m_matrix.Concat(*pMatrix);
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 463
469 void IFWL_DateTimePicker::InitProxyForm() { 464 void IFWL_DateTimePicker::InitProxyForm() {
470 if (m_pForm) 465 if (m_pForm)
471 return; 466 return;
472 if (!m_pMonthCal) 467 if (!m_pMonthCal)
473 return; 468 return;
474 CFWL_WidgetImpProperties propForm; 469 CFWL_WidgetImpProperties propForm;
475 propForm.m_dwStyles = FWL_WGTSTYLE_Popup; 470 propForm.m_dwStyles = FWL_WGTSTYLE_Popup;
476 propForm.m_dwStates = FWL_WGTSTATE_Invisible; 471 propForm.m_dwStates = FWL_WGTSTATE_Invisible;
477 propForm.m_pOwner = this; 472 propForm.m_pOwner = this;
478 m_pForm.reset(IFWL_FormProxy::Create(propForm, m_pMonthCal.get())); 473
474 m_pForm = pdfium::MakeUnique<IFWL_FormProxy>(propForm, m_pMonthCal.get());
479 m_pForm->Initialize(); 475 m_pForm->Initialize();
480 m_pMonthCal->SetParent(m_pForm.get()); 476 m_pMonthCal->SetParent(m_pForm.get());
481 } 477 }
482 478
483 IFWL_DateTimeEdit* IFWL_DateTimePicker::GetDataTimeEdit() { 479 IFWL_DateTimeEdit* IFWL_DateTimePicker::GetDataTimeEdit() {
484 return m_pEdit.get(); 480 return m_pEdit.get();
485 } 481 }
486 482
487 FWL_Error IFWL_DateTimePicker::DisForm_Initialize() { 483 FWL_Error IFWL_DateTimePicker::DisForm_Initialize() {
488 m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat; 484 m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
489 DisForm_InitDateTimeCalendar(); 485 DisForm_InitDateTimeCalendar();
490 DisForm_InitDateTimeEdit(); 486 DisForm_InitDateTimeEdit();
491 RegisterEventTarget(m_pMonthCal.get()); 487 RegisterEventTarget(m_pMonthCal.get());
492 RegisterEventTarget(m_pEdit.get()); 488 RegisterEventTarget(m_pEdit.get());
493 return FWL_Error::Succeeded; 489 return FWL_Error::Succeeded;
494 } 490 }
495 491
496 void IFWL_DateTimePicker::DisForm_InitDateTimeCalendar() { 492 void IFWL_DateTimePicker::DisForm_InitDateTimeCalendar() {
497 if (m_pMonthCal) { 493 if (m_pMonthCal) {
498 return; 494 return;
499 } 495 }
500 CFWL_WidgetImpProperties propMonth; 496 CFWL_WidgetImpProperties propMonth;
501 propMonth.m_dwStyles = 497 propMonth.m_dwStyles =
502 FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border | FWL_WGTSTYLE_EdgeSunken; 498 FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border | FWL_WGTSTYLE_EdgeSunken;
503 propMonth.m_dwStates = FWL_WGTSTATE_Invisible; 499 propMonth.m_dwStates = FWL_WGTSTATE_Invisible;
504 propMonth.m_pParent = this; 500 propMonth.m_pParent = this;
505 propMonth.m_pDataProvider = &m_MonthCalendarDP; 501 propMonth.m_pDataProvider = &m_MonthCalendarDP;
506 propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider; 502 propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider;
507 m_pMonthCal.reset(IFWL_DateTimeCalendar::Create(propMonth, this)); 503
504 m_pMonthCal = pdfium::MakeUnique<IFWL_DateTimeCalendar>(propMonth, this);
508 m_pMonthCal->Initialize(); 505 m_pMonthCal->Initialize();
509 CFX_RectF rtMonthCal; 506 CFX_RectF rtMonthCal;
510 m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE); 507 m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE);
511 rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height); 508 rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height);
512 m_pMonthCal->SetWidgetRect(rtMonthCal); 509 m_pMonthCal->SetWidgetRect(rtMonthCal);
513 } 510 }
514 511
515 void IFWL_DateTimePicker::DisForm_InitDateTimeEdit() { 512 void IFWL_DateTimePicker::DisForm_InitDateTimeEdit() {
516 if (m_pEdit) { 513 if (m_pEdit) {
517 return; 514 return;
518 } 515 }
519 CFWL_WidgetImpProperties propEdit; 516 CFWL_WidgetImpProperties propEdit;
520 propEdit.m_pParent = this; 517 propEdit.m_pParent = this;
521 propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider; 518 propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider;
522 m_pEdit.reset(IFWL_DateTimeEdit::Create(propEdit, this)); 519
520 m_pEdit = pdfium::MakeUnique<IFWL_DateTimeEdit>(propEdit, this);
523 m_pEdit->Initialize(); 521 m_pEdit->Initialize();
524 } 522 }
525 523
526 FX_BOOL IFWL_DateTimePicker::DisForm_IsMonthCalendarShowed() { 524 FX_BOOL IFWL_DateTimePicker::DisForm_IsMonthCalendarShowed() {
527 if (!m_pMonthCal) 525 if (!m_pMonthCal)
528 return FALSE; 526 return FALSE;
529 return !(m_pMonthCal->GetStates() & FWL_WGTSTATE_Invisible); 527 return !(m_pMonthCal->GetStates() & FWL_WGTSTATE_Invisible);
530 } 528 }
531 529
532 void IFWL_DateTimePicker::DisForm_ShowMonthCalendar(FX_BOOL bActivate) { 530 void IFWL_DateTimePicker::DisForm_ShowMonthCalendar(FX_BOOL bActivate) {
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 862
865 int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurMonth( 863 int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurMonth(
866 IFWL_Widget* pWidget) { 864 IFWL_Widget* pWidget) {
867 return m_iCurMonth; 865 return m_iCurMonth;
868 } 866 }
869 867
870 int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurYear( 868 int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurYear(
871 IFWL_Widget* pWidget) { 869 IFWL_Widget* pWidget) {
872 return m_iCurYear; 870 return m_iCurYear;
873 } 871 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698