Merge pull request #360 from zhao-yubiao/master

fix-platte-and-new-icons

Author: datyuesh

src/plugins/ukui-notebook/editPage.cpp

@@ -259,7 +259,7 @@ void Edit_page::slotsSetup()
     // 调色板菜单
     connect(m_noteHeadMenu->ui->pushButtonPalette, &QPushButton::clicked, this, [=](){
         QPointF position = this->pos();
-        color_page->move(position.x()+100,position.y()-36);
+        color_page->move(position.x()+30,position.y()+34);
         color_page->show();
     });
     // 调色按钮
@@ -288,12 +288,12 @@ void Edit_page::slotsSetup()
 
     connect(ui->fontSizeBtn, &QPushButton::clicked, this, [=](){
         QPointF position = this->pos();
-        set_size_page->move(position.x()+227,position.y()+272);
+        set_size_page->move(position.x()+227,position.y()+273);
         set_size_page->show();
     });
     connect(ui->fontColorBtn, &QPushButton::clicked, this, [=](){
         QPointF position = this->pos();
-        set_color_fort_page->move(position.x()+260,position.y()+272);
+        set_color_fort_page->move(position.x()+260,position.y()+273);
         set_color_fort_page->show();
     });
 

src/plugins/ukui-notebook/noteHeadMenu.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>300</width>
-    <height>40</height>
+    <height>42</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,14 +33,14 @@
     <widget class="QPushButton" name="pushButtonNew">
      <property name="minimumSize">
       <size>
-       <width>24</width>
-       <height>24</height>
+       <width>20</width>
+       <height>20</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
-       <width>24</width>
-       <height>24</height>
+       <width>20</width>
+       <height>20</height>
       </size>
      </property>
      <property name="text">