Update borealis

xfangfang · Nov 19, 2024 · 9061c8a · 9061c8a
1 parent b5086ee
commit 9061c8a
Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/library/borealis b/library/borealis
diff --git a/wiliwili/include/view/recycling_grid.hpp b/wiliwili/include/view/recycling_grid.hpp
@@ -239,6 +239,8 @@ class RecyclingGrid : public brls::ScrollingFrame {
      * @param downSide 是向下添加还是向上添加，当向上添加时 将 renderedFrame 的 y 减去当前列表项的高度。（y 的值只在向上添加或移除时候改变）
      */
     void addCellAt(size_t index, bool downSide);
+
+    void removeCell(brls::View *view);
 };
 
 class RecyclingGridContentBox : public brls::Box {

diff --git a/wiliwili/source/view/recycling_grid.cpp b/wiliwili/source/view/recycling_grid.cpp
@@ -247,6 +247,34 @@ void RecyclingGrid::addCellAt(size_t index, bool downSide) {
     brls::Logger::verbose("Cell #{} - added", index);
 }
 
+void RecyclingGrid::removeCell(brls::View* view) {
+    if (!view) return;
+
+    // Find the index of the view
+    size_t index;
+    bool found = false;
+    auto& children = this->contentBox->getChildren();
+
+    for (size_t i = 0; i < children.size(); i++) {
+        View* child = children[i];
+
+        if (child == view) {
+            found = true;
+            index = i;
+            break;
+        }
+    }
+
+    if (!found) return;
+
+    // Remove it
+    children.erase(children.begin() + index);
+
+    view->willDisappear(true);
+
+    this->invalidate();
+}
+
 void RecyclingGrid::setDataSource(RecyclingGridDataSource* source) {
     if (this->dataSource) delete this->dataSource;
 
@@ -263,7 +291,7 @@ void RecyclingGrid::reloadData() {
     auto children = this->contentBox->getChildren();
     for (auto const& child : children) {
         queueReusableCell((RecyclingGridItem*)child);
-        this->contentBox->removeView(child, false);
+        this->removeCell(child);
     }
 
     visibleMin = UINT_MAX;
@@ -391,8 +419,6 @@ void RecyclingGrid::itemsRecyclingLoop() {
     while (true) {
         RecyclingGridItem* minCell = nullptr;
         for (auto it : contentBox->getChildren())
-
-            // todo: contentBox 循环时加锁？it出现过空指针报错
             if (*((size_t*)it->getParentUserData()) == visibleMin) minCell = (RecyclingGridItem*)it;
 
         // 当第一个cell的顶部 与 组件顶部的距离大于 preFetchLine 行元素的距离时结束
@@ -408,7 +434,7 @@ void RecyclingGrid::itemsRecyclingLoop() {
         renderedFrame.size.height -= minCell->getIndex() % spanCount == 0 ? cellHeight + estimatedRowSpace : 0;
 
         queueReusableCell(minCell);
-        this->contentBox->removeView(minCell, false);
+        this->removeCell(minCell);
 
         brls::Logger::verbose("Cell #{} - destroyed", visibleMin);
 
@@ -418,7 +444,6 @@ void RecyclingGrid::itemsRecyclingLoop() {
     // 下方元素自动销毁
     while (true) {
         RecyclingGridItem* maxCell = nullptr;
-        // todo: contentBox 循环时加锁？it出现过空指针报错
         for (auto it : contentBox->getChildren())
             if (*((size_t*)it->getParentUserData()) == visibleMax) maxCell = (RecyclingGridItem*)it;
 
@@ -437,7 +462,7 @@ void RecyclingGrid::itemsRecyclingLoop() {
         renderedFrame.size.height -= maxCell->getIndex() % spanCount == 0 ? cellHeight + estimatedRowSpace : 0;
 
         queueReusableCell(maxCell);
-        this->contentBox->removeView(maxCell, false);
+        this->removeCell(maxCell);
 
         brls::Logger::verbose("Cell #{} - destroyed", visibleMax);
+0 −1		library/include/borealis/core/application.hpp
+1 −0		library/include/borealis/views/recycler.hpp
+1 −3		library/lib/core/application.cpp
+8 −0		library/lib/core/box.cpp
+6 −5		library/lib/core/i18n.cpp
+12 −10		library/lib/platforms/sdl/sdl_input.cpp
+2 −0		library/lib/views/h_scrolling_frame.cpp
+36 −3		library/lib/views/recycler.cpp