openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-11-23 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

codecheck fix

Browse Source 
Signed-off-by: Fenger-hash <duanruifeng@huawei.com>
This commit is contained in:
Fenger-hash 2024-05-15 11:26:44 +08:00
parent 4643cf281b
commit ea52ab8c64
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
previewer/include/wm_common.h
View File

@ -407,12 +407,12 @@ public:
float scaleX_;
float scaleY_;
float scaleZ_;
float translateX_;
float translateY_;
float translateZ_;
float rotationX_;
float rotationY_;
float rotationZ_;
float translateX_;
float translateY_;
float translateZ_;
bool Marshalling(Parcel& parcel) const
{
@ -480,13 +480,13 @@ struct Rect {
/**
* @struct SystemBarProperty
*
* @brief Property of system bar
* @brief Property of system bar.
*/
struct SystemBarProperty {
bool enable_;
bool enableAnimation_;
uint32_t contentColor_;
uint32_t backgroundColor_;
uint32_t contentColor_;
bool enableAnimation_;
SystemBarSettingFlag settingFlag_;
SystemBarProperty() : enable_(true), backgroundColor_(SYSTEM_COLOR_BLACK), contentColor_(SYSTEM_COLOR_WHITE),
enableAnimation_(false), settingFlag_(SystemBarSettingFlag::DEFAULT_SETTING) {}
@ -640,8 +640,8 @@ enum class WindowUpdateType : int32_t {
struct WindowLimits {
uint32_t maxWidth_;
uint32_t minWidth_;
uint32_t maxHeight_;
uint32_t minWidth_;
uint32_t minHeight_;
float maxRatio_;
float minRatio_;
@ -707,12 +707,13 @@ public:
return false;
}
const uint32_t curveParamSize = 4; // 4: param size
auto paramSize = curveParams_.size();
if (paramSize != 4) {
if (paramSize != curveParamSize) {
if (!parcel.WriteUint32(0)) {
return false;
}
} else { // 4: param size
} else {
if (!parcel.WriteUint32(static_cast<uint32_t>(paramSize))) {
return false;
}
@ -745,19 +746,19 @@ public:
}
};
struct MaximizeLayoutOption {
ShowType decor = ShowType::HIDE;
ShowType dock = ShowType::HIDE;
};
/**
* maximize layout show type
* Maximize layout show type
*/
enum ShowType : int32_t {
SHOW, // normally show
HIDE, // show when hover, but hide normally
FORBIDDEN // hide always
};
struct MaximizeLayoutOption {
ShowType decor = ShowType::HIDE;
ShowType dock = ShowType::HIDE;
};
}
}
#endif // OHOS_ROSEN_WM_COMMON_H

10
utils/include/wm_occlusion_region.h
View File

@ -58,12 +58,12 @@ std::ostream& operator<<(std::ostream& os, const Rect& r);
*/
class Event {
public:
// Use different value to differentiate lhs and rhs ranges
// Use different value to differentiate lhs and rhs ranges.
enum Type { OPEN = 1, CLOSE = -1, VOID_OPEN = 2, VOID_CLOSE = -2 };
int y_ = 0;
Type type_ = Type::OPEN;
int left_ = 0;
int right_ = 0;
Type type_ = Type::OPEN;
Event(int y, Type type, int l, int r) : y_(y), type_(type), left_(l), right_(r) {}
};
@ -260,14 +260,14 @@ private:
std::vector<Rect> preRects;
std::vector<Rect> curRects;
};
// get ranges from segmentTree node according to logical operation type
void getRange(std::vector<Range>& ranges, Node& node, OP op);
// update tmp rects and region according to current ranges
void UpdateRects(Rects& r, std::vector<Range>& ranges, std::vector<int>& indexAt, Region& res);
// get ranges from segmentTree node according to logical operation type
void getRange(std::vector<Range>& ranges, Node& node, OP op);
private:
Rect bound_;
std::vector<Rect> rects_;
Rect bound_;
static bool _s_so_loaded_;
};
std::ostream& operator<<(std::ostream& os, const Region& r);