Fixed #17000

Author: palvarezlopez

src/netedit/GNEApplicationWindow.cpp

@@ -517,8 +517,7 @@ GNEApplicationWindow::GNEApplicationWindow(FXApp* app, const GNETagPropertiesDat
     GUITextureSubSys::initTextures(app);
     // init cursors
     GUICursorSubSys::initCursors(app);
-    // create undoList dialog (after initCursors)
-    myUndoListDialog = new GNEUndoListDialog(this);
+    // set tooltip options
     app->setTooltipTime(1000000000);
     app->setTooltipPause(1000000000);
     // set SUMO Options descriptions
@@ -694,7 +693,6 @@ GNEApplicationWindow::~GNEApplicationWindow() {
     }
     // delete undoList and dialog
     delete myUndoList;
-    delete myUndoListDialog;
 }
 
 
@@ -1573,12 +1571,6 @@ GNEApplicationWindow::getUndoList() {
 }
 
 
-GNEUndoListDialog*
-GNEApplicationWindow::getUndoListDialog() {
-    return myUndoListDialog;
-}
-
-
 GNEViewNet*
 GNEApplicationWindow::getViewNet() {
     return myViewNet;
@@ -2629,12 +2621,8 @@ GNEApplicationWindow::onCmdRedo(FXObject* sender, FXSelector, void*) {
 
 long
 GNEApplicationWindow::onCmdOpenUndoListDialog(FXObject*, FXSelector, void*) {
-    // avoid open two dialogs
-    if (myUndoListDialog->shown()) {
-        myUndoListDialog->setFocus();
-    } else {
-        myUndoListDialog->show();
-    }
+    // open UndoList Dialog
+    GNEUndoListDialog(this);
     return 1;
 }
 
@@ -2646,9 +2634,6 @@ GNEApplicationWindow::onUpdOpenUndoListDialog(FXObject* sender, FXSelector, void
         sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
     } else {
         sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
-        if (myUndoListDialog->shown()) {
-            myUndoListDialog->hide();
-        }
     }
     return 1;
 }

src/netedit/GNEApplicationWindow.h

@@ -579,9 +579,6 @@ class GNEApplicationWindow : public GUIMainWindow, public MFXInterThreadEventCli
     /// @brief get pointer to undoList
     GNEUndoList* getUndoList();
 
-    /// @brief get pointer to undoList dialog
-    GNEUndoListDialog* getUndoListDialog();
-
     /// @brief get pointer to viewNet
     GNEViewNet* getViewNet();
 
@@ -752,9 +749,6 @@ class GNEApplicationWindow : public GUIMainWindow, public MFXInterThreadEventCli
     /// @brief the one and only undo list
     GNEUndoList* myUndoList = nullptr;
 
-    /// @brief undoList dialog
-    GNEUndoListDialog* myUndoListDialog = nullptr;
-
     /// @brief Input file pattern
     std::string myConfigPattern;
 

src/netedit/dialogs/GNEUndoListDialog.cpp

@@ -34,18 +34,36 @@ FXDEFMAP(GNEUndoListDialog) GNEUndoListDialogMap[] = {
 };
 
 // Object implementation
-FXIMPLEMENT(GNEUndoListDialog, FXTopWindow, GNEUndoListDialogMap, ARRAYNUMBER(GNEUndoListDialogMap))
+FXIMPLEMENT(GNEUndoListDialog, GNEDialog, GNEUndoListDialogMap, ARRAYNUMBER(GNEUndoListDialogMap))
 
 // ===========================================================================
 // member method definitions
 // ===========================================================================
 
 GNEUndoListDialog::GNEUndoListDialog(GNEApplicationWindow* applicationWindow) :
     GNEDialog(applicationWindow, TL("Undo/Redo history"), GUIIcon::UNDOLIST,
-              Buttons::OK, OpenType::MODAL, ResizeMode::STATIC, 560, 400) {
+              Buttons::OK, OpenType::MODAL, ResizeMode::STATIC) {
     // create scroll windows for rows
-    auto* scrollWindowsContents = new FXScrollWindow(myContentFrame, GUIDesignContentsScrollUndoList);
+    auto* scrollWindowsContents = new FXScrollWindow(myContentFrame, GUIDesignScrollWindowFixed(560, 400));
     myRowFrame = new FXVerticalFrame(scrollWindowsContents, GUIDesignAuxiliarFrame);
+    // set background clor
+    myRowFrame->setBackColor(FXRGB(255, 255, 255));
+    // declare redo iterator over undoList and fill rows
+    GNEUndoList::RedoIterator itRedo(myApplicationWindow->getUndoList());
+    while (!itRedo.end()) {
+        myGUIRows.push_back(new GUIRow(this, myRowFrame, myApplicationWindow->getStaticTooltipView()));
+        itRedo++;
+    }
+    // declare undo iterator over undoList and fill rows
+    GNEUndoList::UndoIterator itUndo(myApplicationWindow->getUndoList());
+    while (!itUndo.end()) {
+        myGUIRows.push_back(new GUIRow(this, myRowFrame, myApplicationWindow->getStaticTooltipView()));
+        itUndo++;
+    }
+    //  update list
+    updateList();
+    // open dialog
+    openDialog();
 }
 
 
@@ -125,31 +143,6 @@ GNEUndoListDialog::updateList() {
 }
 
 
-void
-GNEUndoListDialog::recalcList() {
-    // first clear rows
-    for (auto& GUIRow : myGUIRows) {
-        delete GUIRow;
-    }
-    myGUIRows.clear();
-    // declare redo iterator over undoList and fill rows
-    GNEUndoList::RedoIterator itRedo(myApplicationWindow->getUndoList());
-    while (!itRedo.end()) {
-        myGUIRows.push_back(new GUIRow(this, myRowFrame, myApplicationWindow->getStaticTooltipView()));
-        itRedo++;
-    }
-    // declare undo iterator over undoList and fill rows
-    GNEUndoList::UndoIterator itUndo(myApplicationWindow->getUndoList());
-    while (!itUndo.end()) {
-        myGUIRows.push_back(new GUIRow(this, myRowFrame, myApplicationWindow->getStaticTooltipView()));
-        itUndo++;
-    }
-    // recalc frame and update list
-    myRowFrame->recalc();
-    updateList();
-}
-
-
 GNEUndoListDialog::UndoListRow::UndoListRow(const int index_, FXIcon* icon_, const std::string description_, const std::string timestamp_) :
     index(index_),
     icon(icon_),
@@ -169,11 +162,6 @@ GNEUndoListDialog::GUIRow::GUIRow(GNEUndoListDialog* undoListDialog, FXVerticalF
     // build text label
     myTextFieldTimeStamp = new FXTextField(horizontalFrame, GUIDesignTextFieldNCol, undoListDialog, MID_GNE_SET_ATTRIBUTE, GUIDesignTextFieldFixed(70));
     myTextFieldTimeStamp->setEditable(false);
-    // create elements
-    horizontalFrame->create();
-    myIcon->create();
-    myTextFieldDescription->create();
-    myTextFieldTimeStamp->create();
 }
 
 

src/netedit/dialogs/GNEUndoListDialog.h

@@ -55,15 +55,6 @@ class GNEUndoListDialog : public GNEDialog {
     /// @}
 
 protected:
-    /// @brief FOX needs this
-    FOX_CONSTRUCTOR(GNEUndoListDialog)
-
-    /// @brief update list destroying and creating rows
-    void updateList();
-
-    /// @brief recalc list destroying and creating rows
-    void recalcList();
-
     /// @struct class for keep every row value
     struct UndoListRow {
         /// @brief constructor
@@ -127,6 +118,12 @@ class GNEUndoListDialog : public GNEDialog {
         FXTextField* myTextFieldTimeStamp = nullptr;
     };
 
+    /// @brief FOX needs this
+    FOX_CONSTRUCTOR(GNEUndoListDialog)
+
+    /// @brief update list destroying and creating rows
+    void updateList();
+
     /// @brief frame for rows
     FXVerticalFrame* myRowFrame = nullptr;
 

src/netedit/dialogs/elements/lists/GNEElementTable.cpp

@@ -300,7 +300,7 @@ GNEElementTable::GNEElementTable(GNEElementList* elementList, const GNETagProper
     // create column header
     myColumnHeader = new ColumnHeader(this, tagProperties);
     // create scroll windows for rows
-    myScrollWindow = new FXScrollWindow(this, GUIDesignScrollWindowFixed(400));
+    myScrollWindow = new FXScrollWindow(this, GUIDesignScrollWindowFixedWidth(400));
     // create vertical frame for rows and set back
     myRowsFrame = new FXVerticalFrame(myScrollWindow, GUIDesignAuxiliarFrame);
     myRowsFrame->setBackColor(TEXTCOLOR_BACKGROUND_WHITE);

src/netedit/frames/GNEFrame.cpp

@@ -85,7 +85,7 @@ GNEFrame::GNEFrame(GNEViewParent* viewParent, GNEViewNet* viewNet, const std::st
     new FXHorizontalSeparator(this, GUIDesignHorizontalSeparator);
 
     // Create scroll windows with fixed width for contents
-    myScrollWindowsContents = new FXScrollWindow(this, GUIDesignScrollWindowFixed(10));
+    myScrollWindowsContents = new FXScrollWindow(this, GUIDesignScrollWindowFixedWidth(10));
 
     // Create frame for contents (in which GroupBox will be placed)
     myContentFrame = new FXVerticalFrame(myScrollWindowsContents, GUIDesignAuxiliarFrameFixedWidth(0));

src/utils/gui/div/GUIDesigns.h

@@ -373,10 +373,10 @@ class MFXMenuCheckIcon;
 #define GUIDesignScrollWindow                               (LAYOUT_FILL_X | LAYOUT_FILL_Y | HSCROLLER_NEVER | VSCROLLER_ALWAYS), 0, 0, 0, 0
 
 /// @brief design for scroll windows extended over Y and fix width
-#define GUIDesignScrollWindowFixed(customWidth)             (LAYOUT_FIX_WIDTH | LAYOUT_FILL_Y | HSCROLLER_NEVER | VSCROLLER_ALWAYS), 0, 0, customWidth, 0
+#define GUIDesignScrollWindowFixedWidth(customWidth)        (LAYOUT_FIX_WIDTH | LAYOUT_FILL_Y | HSCROLLER_NEVER | VSCROLLER_ALWAYS), 0, 0, customWidth, 0
 
 /// @brief design for the content scroll of UndoList
-#define GUIDesignContentsScrollUndoList                     (LAYOUT_FILL_X | LAYOUT_FILL_Y | HSCROLLER_NEVER), 0, 0, 0, 0
+#define GUIDesignScrollWindowFixed(width, height)           (LAYOUT_FIX_WIDTH | LAYOUT_FIX_HEIGHT | HSCROLLER_NEVER | VSCROLLER_ALWAYS), 0, 0, width, height
 
 /// @brief design for the main content frame of every frame/dialog
 #define GUIDesignChildWindowContentFrame                    (FRAME_SUNKEN | LAYOUT_SIDE_TOP | LAYOUT_FILL_X | LAYOUT_FILL_Y)