!243 修复编译问题

Merge pull request !243 from wangtiantian/bug_r

frameworks/components/ui_button.cpp

@@ -25,11 +25,7 @@
 
 namespace OHOS {
 UIButton::UIButton()
-    :
-#if DEFAULT_ANIMATION
-      animator_(*this),
-#endif
-      defaultImgSrc_(nullptr),
+    : defaultImgSrc_(nullptr),
       triggeredImgSrc_(nullptr),
       currentImgSrc_(ButtonImageSrc::BTN_IMAGE_DEFAULT),
       imgX_(0),
@@ -38,6 +34,9 @@ UIButton::UIButton()
       contentHeight_(0),
       state_(RELEASED),
       styleState_(RELEASED),
+#if DEFAULT_ANIMATION
+      animator_(*this),
+#endif
       buttonStyleAllocFlag_(false)
 {
     touchable_ = true;

frameworks/components/ui_radio_button.cpp

@@ -41,8 +41,8 @@ UIRadioButton::UIRadioButton(const char* name)
     : name_(nullptr),
       radiusBig_(DEFAULT_RADIUS_BIG),
       radiusSmall_(DEFAULT_RADIUS_SMALL),
-      lineWidth_(DEFAULT_LINE_WIDTH),
-      currentRadius_(0)
+      currentRadius_(0),
+      lineWidth_(DEFAULT_LINE_WIDTH)
 {
     SetName(name);
     image_[UNSELECTED].SetSrc("");

frameworks/draw/draw_utils.cpp

@@ -981,6 +981,7 @@ void DrawUtils::DrawTriangleTrueColorBilinear888(const TriangleScanInfo& in, con
     }
 }
 
+#if !ENABLE_FIXED_POINT
 static void DrawTriangleTrueColorBilinear8888Inner(const TriangleScanInfo& in,
                                                    uint8_t* screenBuffer,
                                                    int16_t len,
@@ -1046,6 +1047,7 @@ static void DrawTriangleTrueColorBilinear8888Inner(const TriangleScanInfo& in,
         screenBuffer += in.bufferPxSize;
     }
 }
+#endif
 
 static void DrawFixedTriangleTrueColorBilinear8888Inner(const TriangleScanInfo& in,
                                                    uint8_t* screenBuffer,
@@ -1440,7 +1442,13 @@ void DrawUtils::DrawTriangleTransformPart(BufferInfo& gfxDstBuffer, const Triang
     TransformInitState init;
     GetTransformInitState(part.transMap, part.position, line, init);
 
-    DRAW_UTILS_PREPROCESS(gfxDstBuffer, OPA_OPAQUE);
+    uint8_t* screenBuffer = static_cast<uint8_t*>(gfxDstBuffer.virAddr);
+    if (screenBuffer == nullptr) {
+        return;
+    }
+    ColorMode bufferMode = gfxDstBuffer.mode;
+    uint8_t bufferPxSize = GetByteSizeByColorMode(bufferMode);
+
     uint8_t pixelSize;
     DrawTriangleTransformFuc fuc;
     bool isTrueColor = (part.info.header.colorMode == ARGB8888) || (part.info.header.colorMode == RGB888) ||

frameworks/font/ui_font_builder.cpp

@@ -17,8 +17,8 @@
 #include "font/ui_font.h"
 
 namespace OHOS {
-UIFontBuilder::UIFontBuilder() : totalLangId_(0), totalFontId_(0), totalTextId_(0),
-                                 uiTextLangFontsTable_(nullptr), langTextDefaultParamTable_(nullptr) {}
+UIFontBuilder::UIFontBuilder() : uiTextLangFontsTable_(nullptr), langTextDefaultParamTable_(nullptr),
+                                 totalLangId_(0), totalFontId_(0), totalTextId_(0) {}
 
 UIFontBuilder* UIFontBuilder::GetInstance()
 {

interfaces/kits/components/ui_button.h

@@ -409,14 +409,6 @@ protected:
     ButtonState state_;
     ButtonState styleState_;
     Style* buttonStyles_[BTN_STATE_NUM];
-    bool buttonStyleAllocFlag_;
-
-private:
-    /** Sets up the theme styles */
-    void SetupThemeStyles();
-
-    void DrawImg(BufferInfo& gfxDstBuffer, const Rect& invalidatedArea, OpacityType opaScale);
-
 #if DEFAULT_ANIMATION
     friend class ButtonAnimator;
     class ButtonAnimator final : public AnimatorCallback {
@@ -441,6 +433,13 @@ private:
         UIButton& button_;
     } animator_;
 #endif
+    bool buttonStyleAllocFlag_;
+
+private:
+    /** Sets up the theme styles */
+    void SetupThemeStyles();
+
+    void DrawImg(BufferInfo& gfxDstBuffer, const Rect& invalidatedArea, OpacityType opaScale);
 };
 } // namespace OHOS
 #endif // GRAPHIC_LITE_UI_BUTTON_H

interfaces/kits/components/ui_image_view.h

@@ -279,7 +279,7 @@ protected:
     /**
      * @brief Represents the color format of this image.
      */
-    uint8_t colorFormat_ : 4;
+    uint8_t colorFormat_;
     /**
      * @brief Represents the blur level of this image when it is rotated or scaled.
      */

ui.gni

@@ -34,10 +34,13 @@ graphic_ui_sources = [
   "$GRAPHIC_UI_PATH/frameworks/components/ui_abstract_clock.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_abstract_progress.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_abstract_scroll.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/components/ui_abstract_scroll_bar.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_analog_clock.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_arc_label.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/components/ui_arc_scroll_bar.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_axis.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_box_progress.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/components/ui_box_scroll_bar.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_button.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_canvas.cpp",
   "$GRAPHIC_UI_PATH/frameworks/components/ui_chart.cpp",
@@ -72,12 +75,15 @@ graphic_ui_sources = [
   "$GRAPHIC_UI_PATH/frameworks/dfx/point_event_injector.cpp",
   "$GRAPHIC_UI_PATH/frameworks/dfx/ui_dump_dom_tree.cpp",
   "$GRAPHIC_UI_PATH/frameworks/dfx/ui_view_bounds.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/dock/focus_manager.cpp",
   "$GRAPHIC_UI_PATH/frameworks/dock/input_device.cpp",
   "$GRAPHIC_UI_PATH/frameworks/dock/key_input_device.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/dock/ohos/ohos_input_device.cpp",
   "$GRAPHIC_UI_PATH/frameworks/dock/pointer_input_device.cpp",
-  "$GRAPHIC_UI_PATH/frameworks/dock/screen_device_proxy.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/dock/rotate_input_device.cpp",
   "$GRAPHIC_UI_PATH/frameworks/dock/vibrator_manager.cpp",
   "$GRAPHIC_UI_PATH/frameworks/dock/virtual_input_device.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/draw/clip_utils.cpp",
   "$GRAPHIC_UI_PATH/frameworks/draw/draw_arc.cpp",
   "$GRAPHIC_UI_PATH/frameworks/draw/draw_curve.cpp",
   "$GRAPHIC_UI_PATH/frameworks/draw/draw_image.cpp",
@@ -92,8 +98,11 @@ graphic_ui_sources = [
   "$GRAPHIC_UI_PATH/frameworks/font/ui_font.cpp",
   "$GRAPHIC_UI_PATH/frameworks/font/ui_font_adaptor.cpp",
   "$GRAPHIC_UI_PATH/frameworks/font/ui_font_allocator.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/font/ui_font_bitmap.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/font/ui_font_builder.cpp",
   "$GRAPHIC_UI_PATH/frameworks/font/ui_font_cache.cpp",
   "$GRAPHIC_UI_PATH/frameworks/font/ui_font_vector.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/font/ui_line_break.cpp",
   "$GRAPHIC_UI_PATH/frameworks/font/ui_multi_font_manager.cpp",
   "$GRAPHIC_UI_PATH/frameworks/imgdecode/cache_manager.cpp",
   "$GRAPHIC_UI_PATH/frameworks/imgdecode/file_img_decoder.cpp",
@@ -103,4 +112,5 @@ graphic_ui_sources = [
   "$GRAPHIC_UI_PATH/frameworks/layout/list_layout.cpp",
   "$GRAPHIC_UI_PATH/frameworks/themes/theme.cpp",
   "$GRAPHIC_UI_PATH/frameworks/themes/theme_manager.cpp",
+  "$GRAPHIC_UI_PATH/frameworks/engines/gfx/gfx_engine_manager.cpp",
 ]