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

Side by Side Diff: ui/gfx/geometry/insets.h

Issue 102253009: gfx: Add an implicit Insets to InsetsF conversion operator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium 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 #ifndef UI_GFX_GEOMETRY_INSETS_H_ 5 #ifndef UI_GFX_GEOMETRY_INSETS_H_
6 #define UI_GFX_GEOMETRY_INSETS_H_ 6 #define UI_GFX_GEOMETRY_INSETS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "ui/gfx/geometry/insets_base.h" 11 #include "ui/gfx/geometry/insets_base.h"
12 #include "ui/gfx/geometry/insets_f.h"
12 #include "ui/gfx/gfx_export.h" 13 #include "ui/gfx/gfx_export.h"
13 14
14 #if defined(TOOLKIT_GTK) 15 #if defined(TOOLKIT_GTK)
15 typedef struct _GtkBorder GtkBorder; 16 typedef struct _GtkBorder GtkBorder;
16 #endif 17 #endif
17 18
18 namespace gfx { 19 namespace gfx {
19 20
20 // An integer version of gfx::Insets. 21 // An integer version of gfx::Insets.
21 class GFX_EXPORT Insets : public InsetsBase<Insets, int> { 22 class GFX_EXPORT Insets : public InsetsBase<Insets, int> {
(...skipping 10 matching lines...) Expand all
32 return Scale(scale, scale); 33 return Scale(scale, scale);
33 } 34 }
34 35
35 Insets Scale(float x_scale, float y_scale) const { 36 Insets Scale(float x_scale, float y_scale) const {
36 return Insets(static_cast<int>(top() * y_scale), 37 return Insets(static_cast<int>(top() * y_scale),
37 static_cast<int>(left() * x_scale), 38 static_cast<int>(left() * x_scale),
38 static_cast<int>(bottom() * y_scale), 39 static_cast<int>(bottom() * y_scale),
39 static_cast<int>(right() * x_scale)); 40 static_cast<int>(right() * x_scale));
40 } 41 }
41 42
43 operator InsetsF() const {
44 return InsetsF(top(), left(), bottom(), right());
45 }
46
42 // Returns a string representation of the insets. 47 // Returns a string representation of the insets.
43 std::string ToString() const; 48 std::string ToString() const;
44 }; 49 };
45 50
46 #if !defined(COMPILER_MSVC) 51 #if !defined(COMPILER_MSVC)
47 extern template class InsetsBase<Insets, int>; 52 extern template class InsetsBase<Insets, int>;
48 #endif 53 #endif
49 54
50 } // namespace gfx 55 } // namespace gfx
51 56
52 #endif // UI_GFX_GEOMETRY_INSETS_H_ 57 #endif // UI_GFX_GEOMETRY_INSETS_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698