openharmony/msdp_device_status
1
0
Fork 0
mirror of https://gitee.com/openharmony/msdp_device_status synced 2024-11-23 07:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "add: set the grayscale of drag pixelMap node"

Browse Source 
This reverts commit 03da9b2f57.

Signed-off-by: yhpeng <pengyuhao1@huawei.com>
This commit is contained in:
yhpeng 2024-06-18 17:11:15 +08:00
parent 57a2227cbe
commit 93f5a669b0
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interfaces/innerkits/interaction/include/drag_data.h
View File

@ -73,7 +73,6 @@ struct DragData {
bool hasCanceledAnimation { false };
bool hasCoordinateCorrected { false };
std::map<std::string, int64_t> summarys;
float dragNodeGrayscale { 0 };
bool operator == (const DragData &other) const
{
@ -82,8 +81,7 @@ struct DragData {
dragNum == other.dragNum && pointerId == other.pointerId && displayX == other.displayX &&
displayY == other.displayY && displayId == other.displayId &&
hasCanceledAnimation == other.hasCanceledAnimation &&
hasCoordinateCorrected == other.hasCoordinateCorrected && summarys == other.summarys &&
dragNodeGrayscale == other.dragNodeGrayscale;
hasCoordinateCorrected == other.hasCoordinateCorrected && summarys == other.summarys;
}
bool operator != (const DragData &other) const

1
services/interaction/drag/include/drag_drawing.h
View File

@ -216,7 +216,6 @@ struct DrawingInfo {
IContext* context { nullptr };
ExtraInfo extraInfo;
FilterInfo filterInfo;
float dragNodeGrayscale { 0 };
};
struct DragWindowRotationInfo {

2
services/interaction/drag/src/drag_drawing.cpp
View File

@ -1177,7 +1177,6 @@ void DragDrawing::InitDrawingInfo(const DragData &dragData)
g_drawingInfo.displayId = dragData.displayId;
g_drawingInfo.displayX = dragData.displayX;
g_drawingInfo.displayY = dragData.displayY;
g_drawingInfo.dragNodeGrayscale = dragData.dragNodeGrayscale;
RotateDisplayXY(g_drawingInfo.displayX, g_drawingInfo.displayY);
if (!ParserExtraInfo(dragData.extraInfo, g_drawingInfo.extraInfo)) {
FI_HILOGI("No parser valid extraInfo data");
@ -1268,7 +1267,6 @@ void DragDrawing::InitCanvas(int32_t width, int32_t height)
std::shared_ptr<Rosen::RSCanvasNode> pixelMapNode = Rosen::RSCanvasNode::Create();
CHKPV(pixelMapNode);
pixelMapNode->SetForegroundColor(TRANSPARENT_COLOR_ARGB);
pixelMapNode->SetGrayScale(g_drawingInfo.dragNodeGrayscale);
g_drawingInfo.nodes.emplace_back(pixelMapNode);
std::shared_ptr<Rosen::RSCanvasNode> dragStyleNode = Rosen::RSCanvasNode::Create();
CHKPV(dragStyleNode);

2
utils/common/src/drag_data_packer.cpp
View File

@ -46,7 +46,6 @@ int32_t DragDataPacker::Marshalling(const DragData &dragData, Parcel &data, bool
WRITEINT32(data, dragData.mainWindow, E_DEVICESTATUS_WRITE_PARCEL_ERROR);
WRITEBOOL(data, dragData.hasCanceledAnimation, E_DEVICESTATUS_WRITE_PARCEL_ERROR);
WRITEBOOL(data, dragData.hasCoordinateCorrected, E_DEVICESTATUS_WRITE_PARCEL_ERROR);
WRITEFLOAT(data, dragData.dragNodeGrayscale, E_DEVICESTATUS_WRITE_PARCEL_ERROR);
if (SummaryPacker::Marshalling(dragData.summarys, data) != RET_OK) {
FI_HILOGE("Marshalling summary failed");
return RET_ERR;
@ -74,7 +73,6 @@ int32_t DragDataPacker::UnMarshalling(Parcel &data, DragData &dragData, bool isC
READINT32(data, dragData.mainWindow, E_DEVICESTATUS_READ_PARCEL_ERROR);
READBOOL(data, dragData.hasCanceledAnimation, E_DEVICESTATUS_READ_PARCEL_ERROR);
READBOOL(data, dragData.hasCoordinateCorrected, E_DEVICESTATUS_READ_PARCEL_ERROR);
READFLOAT(data, dragData.dragNodeGrayscale, E_DEVICESTATUS_READ_PARCEL_ERROR);
if (SummaryPacker::UnMarshalling(data, dragData.summarys) != RET_OK) {
FI_HILOGE("Unmarshalling summary failed");
return RET_ERR;