Commit Graph

152 Commits

Author SHA1 Message Date
Timothy Nikkel
01773a3ec2 Bug 896053. Unlink sibling/child lists of widgets for nsCocoaWindow's correctly. r=smichaud 2013-08-05 23:32:23 -05:00
Gijs Kruitbosch
529434a919 Merge m-c to ux 2013-07-23 11:04:55 +02:00
Gijs Kruitbosch
a349f6bc93 Merge mozilla-central and ux 2013-07-10 23:53:05 +02:00
Timothy Nikkel
a91aea38e2 Bug 891424. Hide cocoa window's when they are destroyed, otherwise they can stay on screen, and remove a different fix for the same bug that caused a regression. r=smichaud
We also remove a different fix for this same bug that caused some regressions: calling RemoveChild so that the nsCocoaWindow actually dies.
2013-07-19 15:57:59 -05:00
Timothy Nikkel
ea8b9e98de Bug 892994. On retina screens cocoa rounds widget coordinates to even pixel values, so account for that when placing widgets so we don't get confused. r=mstange 2013-07-30 11:22:41 -05:00
Timothy Nikkel
3eff19be90 Bug 891424. Directly remove nsCocoaWindow's from their parent in Destroy(). This allows us to stop implementing GetParent because the mac widget code has some assumptions about that always returning null. r=smichaud
This reverts implementing GetParent on nsCocoaWindow's (ie back out bug 869151) because the mac widget code has some assumptions about that. Instead we just remove nsCocoaWindow's from their mParent in Destroy() which will still keep bug 869151 fixed.
2013-07-09 22:52:19 -05:00
Ryan VanderMeulen
e4dfd6d1e1 Backed out changeset a6b9f94bf21b (bug 891424) for assertions. 2013-07-09 17:15:41 -04:00
Timothy Nikkel
ff2fcf3cf0 Bug 891424. Directly remove nsCocoaWindow's from their parent in Destroy(). This allows us to stop implementing GetParent because the mac widget code has some assumptions about that always returning null. r=smichaud
This reverts implementing GetParent on nsCocoaWindow's (ie back out bug 869151) because the mac widget code has some assumptions about that. Instead we just remove nsCocoaWindow's from their mParent in Destroy() which will still keep bug 869151 fixed.
2013-07-09 15:14:01 -05:00
Gijs Kruitbosch
94d52c4cc4 Merge mozilla-central and ux-central 2013-06-08 00:09:29 +02:00
Mike Conley
ad9596b630 Automated merge with https://hg.mozilla.org/mozilla-central 2013-05-27 11:19:45 -04:00
Markus Stange
d34547823f Bug 676241 part 7: Update comments. 2013-05-23 16:49:17 +02:00
Markus Stange
e3ca87e242 Bug 676241 part 6/9/11: Correct titlebar drawing. r=bgirard, r=smichaud, r=mattwoodrow 2013-05-23 16:49:17 +02:00
Markus Stange
ccc05c79b0 Bug 676241 part 4: Make the window's contentView cover the whole window in drawsContentsIntoWindowFrame mode. r=smichaud 2013-05-23 16:49:17 +02:00
Markus Stange
55d5150bd3 Bug 676241 - Back out _drawTitleBar swizzling from UX (originally landed in bug 865374 and bug 868211) because it's no longer necessary. 2013-05-23 19:53:03 +02:00
Markus Stange
d15e67fdb8 Bug 676241 part 3: Remove titlebar drawing. r=josh 2013-05-23 16:49:16 +02:00
Markus Stange
08371d5c8a Bug 676241 part 2: Remove titlebar event redirection. r=josh 2013-05-23 16:49:16 +02:00
Markus Stange
15e3945951 Bug 871590 - Make unified titlebar / toolbar handling more robust. r=roc 2013-05-22 11:50:57 +02:00
Masayuki Nakano
db93e5e899 Bug 807893 part.2 Cocoa widget should manage secure input mode with input context at changing the context and changing focus r=smichaud 2013-05-25 01:27:52 +09:00
Masayuki Nakano
fb14551e52 Bug 807893 part.1 Remove nsIWidget::BeginSecureInput() and nsIWidget::EndSecureInput() r=roc, sr=roc 2013-05-25 01:27:52 +09:00
JosiahOne
2d855a9726 Bug 853105 - Allow double-click to minimize on windows with drawInTitlebar enabled. r=mstange, r=smichaud 2013-05-20 17:38:54 -04:00
Markus Stange
ddf3106bdf Bug 676241 part 7: Update comments. 2013-05-23 16:49:17 +02:00
Markus Stange
0f6c6dbcbb Bug 676241 part 6/9/11: Correct titlebar drawing. r=bgirard, r=smichaud, r=mattwoodrow 2013-05-23 16:49:17 +02:00
Markus Stange
e61aece191 Bug 676241 part 4: Make the window's contentView cover the whole window in drawsContentsIntoWindowFrame mode. r=smichaud 2013-05-23 16:49:17 +02:00
Markus Stange
893a9122a4 Bug 676241 part 3: Remove titlebar drawing. r=josh 2013-05-23 16:49:16 +02:00
Markus Stange
8d7ccf203f Bug 676241 part 2: Remove titlebar event redirection. r=josh 2013-05-23 16:49:16 +02:00
Markus Stange
ea03392fcc Bug 871590 - Make unified titlebar / toolbar handling more robust. r=roc 2013-05-22 11:50:57 +02:00
Markus Stange
82b48366b9 Bug 871590 / Bug 625989 - Add basic support for -moz-appearance: -moz-window-titlebar on OS X. Partly written by Mike Conley. r=josh 2013-05-22 11:48:47 +02:00
Mike Conley
5c6a1c3ca3 Mostly automated merge with https://hg.mozilla.org/mozilla-central 2013-05-13 13:04:32 -04:00
Markus Stange
977ecaeb2a Bug 868211 - Simplify Mac implementation of -moz-window-button-box. r=smichaud 2013-05-03 19:31:01 +02:00
Steven Michaud
4d367b50bc Bustage fix for Bug 865374 - fixes problems for OSX versions without the fullscreen button. r=bgirard 2013-05-02 19:31:49 -04:00
Mike Conley
bb41d7794a Bug 865374 - Position tabs in the OSX titlebar. Cocoa Widget work by Steven Michaud. r=dao,bgirard. 2013-05-02 14:15:29 -04:00
Mike Conley
3bbe526646 Mostly automated merge with https://hg.mozilla.org/mozilla-central 2013-05-02 12:41:21 -04:00
Mike Conley
cda58872ff Automated merge with https://hg.mozilla.org/mozilla-central 2013-04-25 17:55:05 -04:00
Mike Conley
9681684e06 Automated merge with https://hg.mozilla.org/mozilla-central 2013-04-23 10:50:24 -04:00
Nicolas Silva
391cf268bb Bug 863324 - Rename PLayers into PLayerTransaction, r=jrmuizel
--HG--
rename : gfx/layers/ipc/ShadowLayersChild.cpp => gfx/layers/ipc/LayerTransactionChild.cpp
rename : gfx/layers/ipc/ShadowLayersChild.h => gfx/layers/ipc/LayerTransactionChild.h
rename : gfx/layers/ipc/ShadowLayersParent.cpp => gfx/layers/ipc/LayerTransactionParent.cpp
rename : gfx/layers/ipc/ShadowLayersParent.h => gfx/layers/ipc/LayerTransactionParent.h
rename : gfx/layers/ipc/PLayers.ipdl => gfx/layers/ipc/PLayerTransaction.ipdl
2013-04-24 14:42:40 -04:00
Markus Stange
7b49365fa6 Backed out 2 changesets (bug 871590) CLOSED TREE 2013-05-22 14:10:46 +02:00
Mike Conley
ab28d98af1 Automated merge with https://hg.mozilla.org/mozilla-central 2013-04-19 16:58:03 -04:00
Markus Stange
7343081400 Bug 871590 - Make unified titlebar / toolbar handling more robust. r=roc
--HG--
extra : rebase_source : dc4c5dff4f0a392e096976b355bcf2140f7b2879
2013-05-22 11:50:57 +02:00
Markus Stange
c53450ff86 Bug 871590 / Bug 625989 - Add basic support for -moz-appearance: -moz-window-titlebar on OS X. Partly written by Mike Conley. r=josh
--HG--
extra : rebase_source : 23f17c9bd93ae34ce171ebe24b3576b4c825795e
2013-05-22 11:48:47 +02:00
Mike Conley
36c82dbc9f Bug 625989 - Always draw in the titlebar on OSX. r=josh,dao f=mstange 2013-03-01 13:48:18 -05:00
Timothy Nikkel
d9afbfd672 Bug 869151. Implement GetParent for nsCocoaWindow so that nsBaseWidget::Destroy can find the parent and remove from the child list when destroying. r=smichaud 2013-05-09 18:57:20 -05:00
Timothy Nikkel
1a14c4a198 Bug 870568. Change assertion about destroying an nsCocoaWindow while modal to a warning because the code handles that case. r=smichaud 2013-05-09 18:57:19 -05:00
Ryan VanderMeulen
ff842617a6 Backed out changeset 35575118c650 (bug 912794) for asserts. 2013-09-06 23:08:36 -04:00
Milan Sreckovic
7e8ba1c301 Bug 912794 - Separate out the CMS globals and prefs into a singleton gfxColorManagement. r=ncameron
Preferences are now initialized at startup, then updated with callbacks. The methods that access the cached values are not checking the preferences. This lets us better control which thread reads the prefs.

--HG--
rename : gfx/thebes/gfxPlatform.cpp => gfx/thebes/gfxColorManagement.cpp
rename : gfx/thebes/gfxPlatform.h => gfx/thebes/gfxColorManagement.h
2013-09-06 12:48:17 -07:00
Steven Michaud
6c6038ecfd Bug 861317 - nsChildView::WillPaint terribly inefficient when drawing to titlebar. r=bgirard 2013-04-18 18:40:40 -05:00
Ehsan Akhgari
8d3203e0f8 Backed out changeset fdaa0659fe13 (bug 863324) because of build bustage on a CLOSED TREE
--HG--
rename : gfx/layers/ipc/PLayerTransaction.ipdl => gfx/layers/ipc/PLayers.ipdl
rename : gfx/layers/ipc/LayerTransactionChild.cpp => gfx/layers/ipc/ShadowLayersChild.cpp
rename : gfx/layers/ipc/LayerTransactionChild.h => gfx/layers/ipc/ShadowLayersChild.h
rename : gfx/layers/ipc/LayerTransactionParent.cpp => gfx/layers/ipc/ShadowLayersParent.cpp
rename : gfx/layers/ipc/LayerTransactionParent.h => gfx/layers/ipc/ShadowLayersParent.h
2013-04-22 18:12:15 -04:00
Nicolas Silva
ab0ca9312a Bug 863324 - Rename PLayers into PLayerTransaction, r=jrmuizel
--HG--
rename : gfx/layers/ipc/ShadowLayersChild.cpp => gfx/layers/ipc/LayerTransactionChild.cpp
rename : gfx/layers/ipc/ShadowLayersChild.h => gfx/layers/ipc/LayerTransactionChild.h
rename : gfx/layers/ipc/ShadowLayersParent.cpp => gfx/layers/ipc/LayerTransactionParent.cpp
rename : gfx/layers/ipc/ShadowLayersParent.h => gfx/layers/ipc/LayerTransactionParent.h
rename : gfx/layers/ipc/PLayers.ipdl => gfx/layers/ipc/PLayerTransaction.ipdl
2013-04-22 22:51:11 -04:00
Timothy Nikkel
1a2b7b476a Bug 864219. nsCocoaWindow::DoResize should be explicit about converting doubles to ints. r=jfkthame 2013-04-22 15:18:28 -05:00
Ryan VanderMeulen
25f1906153 Backed out changeset ddf944cc292d (bug 863324) for Android bustage on a CLOSED TREE.
--HG--
rename : gfx/layers/ipc/PLayerTransaction.ipdl => gfx/layers/ipc/PLayers.ipdl
rename : gfx/layers/ipc/LayerTransactionChild.cpp => gfx/layers/ipc/ShadowLayersChild.cpp
rename : gfx/layers/ipc/LayerTransactionChild.h => gfx/layers/ipc/ShadowLayersChild.h
rename : gfx/layers/ipc/LayerTransactionParent.cpp => gfx/layers/ipc/ShadowLayersParent.cpp
rename : gfx/layers/ipc/LayerTransactionParent.h => gfx/layers/ipc/ShadowLayersParent.h
2013-04-22 14:47:16 -04:00
Nicolas Silva
3b0ce69477 Bug 863324 - Rename PLayers into PLayerTransaction, r=jrmuizel
--HG--
rename : gfx/layers/ipc/ShadowLayersChild.cpp => gfx/layers/ipc/LayerTransactionChild.cpp
rename : gfx/layers/ipc/ShadowLayersChild.h => gfx/layers/ipc/LayerTransactionChild.h
rename : gfx/layers/ipc/ShadowLayersParent.cpp => gfx/layers/ipc/LayerTransactionParent.cpp
rename : gfx/layers/ipc/ShadowLayersParent.h => gfx/layers/ipc/LayerTransactionParent.h
rename : gfx/layers/ipc/PLayers.ipdl => gfx/layers/ipc/PLayerTransaction.ipdl
2013-04-22 18:07:48 -04:00
Brandon Waterloo
c7a4bb383f Bug 863841 - Implement recognition of double-tap gestures with smartMagnifyWithEvent (Mountain Lion and up), and magnifyWithEvent (Lion). r=smichaud, r=masayuki
On 10.6 SDK, it was necessary to change nsCocoaWindow.mm/h in order to make it call magnifyWithEvent for double-tap gestures properly.
2013-04-29 11:24:26 -04:00
Jonathan Kew
0201d8265e bug 853252 - check for changed backing scale when we receive a windowDidChangeScreen message. r=smichaud 2013-04-12 08:45:50 +01:00
Andre Reinald
86c8786005 Bug 675410 - Fix bottom rounded corners, hopefully in the same openGL context as the rest of the window. r=mstange, r=bgirard 2013-03-27 11:49:02 -04:00
Benoit Girard
679f82dda8 Bug 699538 - Only register the event tap while our app is in the background and has a context menu open, because that's the only scenario we need it for. r=smichaud
--HG--
extra : rebase_source : 2f188f88e73fa12ca05731f3786443d833fe50c8
2011-11-07 11:43:10 -05:00
Masayuki Nakano
ef387dacc0 Bug 558976 part.3 Implement nsIWidget::NotifyIME() on Cocoa r=smichaud 2013-03-06 15:14:34 +09:00
Josh Aas
895a771a33 Bug 647216: Allow mouse event handling in the title bar on OS X. A number of contributors to this patch, including Markus Stange, Paul O'Shannessy, Mike Conley, Stephen Pohl, and myself (Josh Aas). r=mstange,dao,enndeakin 2013-02-05 15:40:34 -06:00
Steven Michaud
a1b1f796ee Bug 740923 - Lion Fullscreen: Black area when opening new windows. r=bgirard 2013-02-05 15:23:55 -06:00
Josh Aas
3482bb8b78 Back out fix for bug 647216 due to test failures. CLOSED TREE 2013-02-04 10:05:06 -06:00
Josh Aas
5d6290a834 Bug 647216: Allow mouse event handling in the title bar on OS X. A number of contributors to this patch, including Markus Stange, Paul O'Shannessy, Mike Conley, Stephen Pohl, and myself (Josh Aas). r=mstange,dao,enndeakin 2013-02-04 09:00:42 -06:00
Jonathan Kew
e63c592d3a Bug 831342 - Quite noisy rollupWidget warnings on OSX, r=smichaud 2013-01-28 15:34:00 -06:00
Matt Woodrow
7c9fcbfaef Bug 831829 - Fix OSX titlebar painting from being upside-down and tiled. r=roc 2013-01-19 14:07:32 +13:00
Matt Woodrow
23cabe0437 Bug 820839 - Draw OSX titlebar content into a retained buffer during the ThebesLayer painting phase, before we clear invalidation state. r=roc 2013-01-17 11:59:23 +13:00
Mats Palmgren
6c53161814 Bug 786533 - Replace NS_MIN/NS_MAX with std::min/std::max and #include <algorithm> where needed. r=ehsan 2013-01-15 13:22:03 +01:00
Jim Mathies
bf0ef59040 Bug 819888 - Check the result of nsBaseWidget::GetActiveRollupListener. r=enndeakin 2012-12-31 11:27:04 -06:00
Jonathan Kew
8ff63dd0ba bug 820327 - work around potentially misleading backingScaleFactor returned by windows with zero area. r=roc 2012-12-14 09:46:16 +00:00
Jonathan Kew
aa8404a74a bug 819725 pt 1 - make widget move & resize methods take floating-point parameters, to allow passing fractional coordinates without rounding. r=roc 2012-12-12 09:57:38 +00:00
Jonathan Kew
9ccd2a254b bug 814434 - use global display pixels for window positioning/sizing for consistency across mixed-resolution screens. r=smichaud 2012-12-06 17:31:34 +00:00
Jonathan Kew
611a4fe1a7 bug 803030 - convert display to device pixels before creating the popup child view. r=smichaud 2012-10-18 11:38:26 +01:00
Josh Aas
4c7422ffc4 Back out both patches for bug 647216 due to regression documented in bug 806244. 2012-11-01 09:19:24 -04:00
Robert O'Callahan
12b00cd718 Bug 804062. Move device-pixels-per-CSS-pixel preference logic into nsIWidget::GetDefaultScale. r=jfkthame
The only behavior change caused by this patch should be that nsDeviceContexts with no widget
(mainly printing, I think), default to a devpixel-per-CSS-pixel ratio of 1.0, ignoring
any prefs set.
2012-10-31 11:31:35 +11:00
Josh Aas
99e96d604f Bug 647216: Add ability to handle mouse events in the title bar on OS X. Work started by Markus Stange and Paul O'Shannessy. r=mstange 2012-10-26 15:42:50 -04:00
Neil Deakin
c56bc18541 Bug 701760, merge <select> and popup manager rollup handling, so that select elements don't cancel out any popup rollup listeners, r=mats 2012-10-26 09:15:22 -04:00
Jonathan Kew
067883aef3 bug 794038 pt 2.1 - update mSizeConstraints when the device resolution of the window changes. r=smichaud 2012-10-16 20:41:20 +01:00
Jonathan Kew
d0245b58c2 bug 794038 pt 2.0 - respond to changes to backing-store resolution when a window moves between HiDPI and non-HiDPI displays. r=smichaud 2012-10-16 20:41:20 +01:00
Jonathan Kew
f6b64e2bc1 bug 794038 pt 1.3 - nsCocoaWindow::Resize should only constrain the window to its current screen if no new position was passed. r=smichaud 2012-10-16 20:41:20 +01:00
Jonathan Kew
942fc8cf67 bug 794038 pt 1.0 - use global display pixel coordinates to persist and restore XUL window position and size. r=roc 2012-10-16 20:41:19 +01:00
Jonathan Kew
2cf5d23c2c bug 674373 pt 6 - support HiDPI display in Cocoa widget code. r=roc,smichaud 2012-09-29 12:36:09 +01:00
Ehsan Akhgari
0fd9123eac Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Neil Deakin
279f4c393a Bug 743975 - remove the event handler argument to widget creation methods, r=tn 2012-08-15 14:53:09 -04:00
Neil Deakin
3e40b0b005 Bug 743975 - use a widget listener interface instead of the remaining events that don't need an event, r=tn,jmathies,netzen,smichaud,karlt,blassey,chrisjones 2012-08-15 14:52:42 -04:00
Steven Michaud
e9035fae02 Bug 764176 - Cap area of rectangles passed to CUIDraw. r=mstange 2012-08-01 10:30:31 -05:00
Neil Deakin
e1405e0a93 Bug 357725, support minimum and maximum size constraints on windows and popups, r=mats,jmathies,karlt,smichaud,sr=neil 2012-07-30 20:43:29 -04:00
Aryeh Gregor
e806eeab4f Bug 777292 part 2 - Change all nsnull to nullptr 2012-07-30 17:20:58 +03:00
Mark Capella
fd9b625002 Bug 775041 - Make nsIWidget::IsEnabled return bool, r=roc, f=ms2ger 2012-07-23 01:19:08 -04:00
Mark Capella
430f93c039 Bug 769998 - Make nsIWidget::IsVisible return bool, r=roc, f=ms2ger 2012-07-19 04:57:50 -04:00
Steven Michaud
27f7d634ab Bug 752294 - Handle failure to enter fullscreen mode because window is invisible. r=bgirard 2012-06-20 10:52:13 -05:00
Steven Michaud
f389636809 Bug 757618 - Closing window while in Lion fullscreen mode leaves one on blank screen for 10-15 seconds. r=bgirard 2012-06-18 10:20:02 -05:00
Gervase Markham
ca171eec44 Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Paul O’Shannessy
d4204c77e5 Bug 752149 - [OS X] nsCocoaWindow::ConstrainPosition uses wrong screen in multi-display setup [r=smichaud]
Specifically, when loading the position from persisted attributes and the window
should open on a 2nd display, it opens on the 1st.
2012-05-18 15:16:50 -07:00
Cameron McCormack
5dd2245960 Bug 715024 - Remove duplicate functions on nsCocoaFeatures and nsToolkit. r=bgirard 2012-05-17 17:53:20 +10:00
Cameron McCormack
b7018ae4b9 Back out bug 715024 due to bustage. 2012-05-17 12:13:02 +10:00
Cameron McCormack
84672a9d98 Bug 715024 - Remove duplicate functions on nsCocoaFeatures and nsToolkit. r=bgirard 2012-05-17 11:36:56 +10:00
Nickolay Ponomarev
101771e87f Bug 726943 - Fullscreen button in HTML video makes the browser go fullscreen but not the video [r=mstange]
Don't fire extraneous NS_SIZEMODE events from windowDidResize, that cause the DOM fullscreen requests to be cancelled on Mac.
2012-03-29 12:18:50 -07:00
Paul O’Shannessy
19f4b6e9a3 Bug 639705 (Lion Full Screen) Part 2: Support Lion Full Screen when fullscreenbutton=true [r=josh,mstange]
--HG--
extra : rebase_source : ce2751e4b32cf0d4344b5ca6a642e1e172c04e3b
2012-03-20 16:21:14 -07:00
Cameron McCormack
407103f6cc Bug 674370 - Make browser windows (and other document-like windows) zoom on creation on OS X 10.7. r=mstange,dao sr=bzbarsky 2012-02-17 14:47:39 +11:00
Paul O’Shannessy
add8175faf Bug 539601 - [OS X] window.sizeMode incorrect when using full screen mode [r=mstange] 2012-02-08 11:59:18 -08:00
Marco Bonardo
faa6279f01 Backout 7a8b935ab596 (bug 674370) for Paint regression 2012-02-08 09:23:40 +01:00
Cameron McCormack
2cca66143e Bug 674370 - Make browser windows (and other document-like windows) zoom on creation on OS X 10.7. r=mstange,dao sr=bzbarsky 2012-02-08 11:44:45 +11:00
Markus Stange
e66671917e Bug 715867 - Don't fire duplicate sizemodechange events on Mac. r=smichaud
--HG--
rename : widget/tests/window_bug596600.xul => widget/tests/empty_window.xul
2012-01-31 11:40:03 +01:00
Markus Stange
28f2ac48f7 Bug 598482 part 3 - Remove synchronous painting APIs from nsIWidget. r=roc 2011-12-23 22:52:21 -05:00