From c0f7e5deb317938dd81009db2b398b508e7cd335 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 1 Jun 2020 10:20:11 +0200 Subject: [PATCH] PORT BACK: fixed a few flaws (fixed-width side panel ..) 1. On "save as" the filename displayed in the cell view selection box was not updated 2. The width of the library and cellview panel could not be reduced below the width of the combo boxes in the headers. So the panels might have become pretty wide without being able to reduce them. --- src/edt/edt/EditorOptionsInst.ui | 386 +++++++++--------- src/edt/edt/InstPropertiesPage.ui | 108 ++++- .../laybasic/layHierarchyControlPanel.cc | 1 + src/laybasic/laybasic/layLayoutView.cc | 2 + src/laybasic/laybasic/layLibrariesView.cc | 3 +- 5 files changed, 292 insertions(+), 208 deletions(-) diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui index 74a3eb7be..3cd38120a 100644 --- a/src/edt/edt/EditorOptionsInst.ui +++ b/src/edt/edt/EditorOptionsInst.ui @@ -1,7 +1,8 @@ - + + EditorOptionsInst - - + + 0 0 @@ -9,52 +10,66 @@ 574 - + Form - - - 9 - - + + 6 + + 9 + + + 9 + + + 9 + + + 9 + - - + + QFrame::NoFrame - + QFrame::Raised - - - 0 - - + + 6 + + 0 + + + 0 + + + 0 + + + 0 + - - - - 0 - 0 + + + 0 0 - + Cell - - - - 7 - 0 + + + 0 0 @@ -62,47 +77,41 @@ - - + + ... - - + + Library - - - - - - Qt::Horizontal + + + + 0 + 0 + - - - 40 - 20 - - - + - + Qt::Vertical - + QSizePolicy::Fixed - + 522 8 @@ -111,99 +120,111 @@ - - - - 7 - 7 + + + 0 1 - + 0 - - + + Geometry - - - 9 - - + + 6 + + 9 + + + 9 + + + 9 + + + 9 + - - + + Rotation / Scaling - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - - - 0 - 0 + + + + 0 0 - - - + + + Mirror - + mirror_cbx - - - + + + Scaling factor (magnification) - - - - - 0 - 0 + + + + 0 0 - - - + + + degree - - - + + + Rotation angle - - - + + + (at X-axis before rotation) @@ -212,182 +233,177 @@ - - - - 5 - 5 + + + 0 0 - + Array Instance - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Column vector (x,y) - - - - - 0 - 0 + + + + 1 0 - - - + + + x = - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 + + + + 1 0 - - - + + + y = - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 + + + + 1 0 - - - + + + y = - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 + + + + 1 0 - - - + + + x = - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + Row vector (x,y) - - - + + + Rows/Columns - - - + + + columns = - - - - - 0 - 0 + + + + 1 0 - - - + + + rows = - - - - - 0 - 0 + + + + 1 0 - - - + + + Warning: although row and column vectors can be arbitrary combination, some design systems only accept orthogonal (rectangular) arrays. - + true @@ -397,10 +413,10 @@ some design systems only accept orthogonal (rectangular) arrays. - + Qt::Vertical - + 20 40 @@ -410,26 +426,26 @@ some design systems only accept orthogonal (rectangular) arrays. - - + + PCell - - + + Place origin of cell - + Qt::Vertical - + 50 8 @@ -462,8 +478,6 @@ some design systems only accept orthogonal (rectangular) arrays. column_y_le place_origin_cb - - - + diff --git a/src/edt/edt/InstPropertiesPage.ui b/src/edt/edt/InstPropertiesPage.ui index 0c6eea4c2..ab2f59622 100644 --- a/src/edt/edt/InstPropertiesPage.ui +++ b/src/edt/edt/InstPropertiesPage.ui @@ -17,7 +17,16 @@ 6 - + + 9 + + + 9 + + + 9 + + 9 @@ -32,7 +41,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -84,7 +102,16 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 @@ -119,20 +146,14 @@ - - - - - - Qt::Horizontal + + + + 0 + 0 + - - - 40 - 20 - - - + @@ -178,7 +199,16 @@ 6 - + + 9 + + + 9 + + + 9 + + 9 @@ -190,7 +220,16 @@ QFrame::Raised - + + 0 + + + 0 + + + 0 + + 0 @@ -265,7 +304,16 @@ Position / Rotation / Scaling - + + 9 + + + 9 + + + 9 + + 9 @@ -393,7 +441,16 @@ true - + + 9 + + + 9 + + + 9 + + 9 @@ -629,7 +686,16 @@ some design systems only accept orthogonal (rectangular) arrays. 6 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/laybasic/laybasic/layHierarchyControlPanel.cc b/src/laybasic/laybasic/layHierarchyControlPanel.cc index 14d5815ee..3115d1f1b 100644 --- a/src/laybasic/laybasic/layHierarchyControlPanel.cc +++ b/src/laybasic/laybasic/layHierarchyControlPanel.cc @@ -260,6 +260,7 @@ HierarchyControlPanel::HierarchyControlPanel (lay::LayoutView *view, QWidget *pa mp_selector = new QComboBox (this); mp_selector->setObjectName (QString::fromUtf8 ("cellview_selection")); + mp_selector->setSizePolicy (QSizePolicy::Ignored, QSizePolicy::Fixed); ly->addWidget (mp_selector); mp_search_frame = new QFrame (this); diff --git a/src/laybasic/laybasic/layLayoutView.cc b/src/laybasic/laybasic/layLayoutView.cc index 1c3ebc16d..4b902417c 100644 --- a/src/laybasic/laybasic/layLayoutView.cc +++ b/src/laybasic/laybasic/layLayoutView.cc @@ -4681,6 +4681,8 @@ LayoutView::active_library_changed (int /*index*/) void LayoutView::cellview_changed (unsigned int index) { + mp_hierarchy_panel->do_update_content (index); + cellview_changed_event (index); if (m_title.empty ()) { diff --git a/src/laybasic/laybasic/layLibrariesView.cc b/src/laybasic/laybasic/layLibrariesView.cc index 58b4c0737..fd9aced34 100644 --- a/src/laybasic/laybasic/layLibrariesView.cc +++ b/src/laybasic/laybasic/layLibrariesView.cc @@ -230,7 +230,8 @@ LibrariesView::LibrariesView (lay::LayoutView *view, QWidget *parent, const char ly->setContentsMargins (0, 0, 0, 0); mp_selector = new QComboBox (this); - mp_selector->setObjectName (QString::fromUtf8 ("cellview_selection")); + mp_selector->setObjectName (QString::fromUtf8 ("library_selection")); + mp_selector->setSizePolicy (QSizePolicy::Ignored, QSizePolicy::Fixed); ly->addWidget (mp_selector); mp_search_frame = new QFrame (this);