luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-08-31 18:16:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Matthias Koefferlein
2022-05-15 17:29:08 +02:00
parent f5b4bbb62c
commit f0dcd59060
5 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/laybasic/laybasic/layLayoutViewBase.cc
+12 -12
View File
@@ -235,11 +235,11 @@ struct OpDeleteLayerProps
const double animation_interval = 0.5;
LayoutViewBase::LayoutViewBase (db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options)
: lay::Dispatcher (plugin_parent, false /*not standalone*/),
LayoutViewBase::LayoutViewBase (db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options) :
#if defined(HAVE_QT)
mp_widget (0),
QFrame (0),
#endif
lay::Dispatcher (plugin_parent, false /*not standalone*/),
mp_ui (0),
m_editable (editable),
m_options (options),
@@ -252,14 +252,14 @@ LayoutViewBase::LayoutViewBase (db::Manager *manager, bool editable, lay::Plugin
}
#if defined(HAVE_QT)
LayoutViewBase::LayoutViewBase (QWidget *widget, lay::LayoutView *ui, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options)
LayoutViewBase::LayoutViewBase (QWidget *parent, lay::LayoutView *ui, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options) :
#else
LayoutViewBase::LayoutViewBase (lay::LayoutView *ui, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options)
LayoutViewBase::LayoutViewBase (lay::LayoutView *ui, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options) :
#endif
: lay::Dispatcher (plugin_parent, false /*not standalone*/),
#if defined(HAVE_QT)
mp_widget (widget),
QFrame (parent),
#endif
lay::Dispatcher (plugin_parent, false /*not standalone*/),
mp_ui (ui),
m_editable (editable),
m_options (options),
@@ -272,14 +272,14 @@ LayoutViewBase::LayoutViewBase (lay::LayoutView *ui, db::Manager *manager, bool
}
#if defined(HAVE_QT)
LayoutViewBase::LayoutViewBase (QWidget *widget, lay::LayoutView *ui, lay::LayoutViewBase *source, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options)
LayoutViewBase::LayoutViewBase (QWidget *parent, lay::LayoutView *ui, lay::LayoutViewBase *source, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options) :
#else
LayoutViewBase::LayoutViewBase (lay::LayoutView *ui, lay::LayoutViewBase *source, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options)
LayoutViewBase::LayoutViewBase (lay::LayoutView *ui, lay::LayoutViewBase *source, db::Manager *manager, bool editable, lay::Plugin *plugin_parent, unsigned int options) :
#endif
: lay::Dispatcher (plugin_parent, false /*not standalone*/),
#if defined(HAVE_QT)
mp_widget (widget),
QFrame (parent),
#endif
lay::Dispatcher (plugin_parent, false /*not standalone*/),
mp_ui (ui),
m_editable (editable),
m_options (options),
@@ -3375,7 +3375,7 @@ LayoutViewBase::box () const
QWidget *
LayoutViewBase::widget ()
{
return mp_widget;
return this;
}
#endif
src/laybasic/laybasic/layLayoutViewBase.h
+5 -5
View File
@@ -54,7 +54,7 @@
#include "dbInstElement.h"
#if defined(HAVE_QT)
class QWidget;
# include <QFrame>
#endif
namespace rdb {
@@ -155,6 +155,9 @@ struct LAYBASIC_PUBLIC LayerDisplayProperties
* It manages the layer display list, bookmark list etc.
*/
class LAYBASIC_PUBLIC LayoutViewBase :
#if defined(HAVE_QT)
public QFrame,
#endif
public lay::Editables,
public lay::Dispatcher
{
@@ -193,7 +196,7 @@ public:
* @brief Constructor
*/
#if defined(HAVE_QT)
LayoutViewBase (QWidget *widget, lay::LayoutView *ui, db::Manager *mgr, bool editable, lay::Plugin *plugin_parent, unsigned int options = (unsigned int) LV_Normal);
LayoutViewBase (QWidget *parent, lay::LayoutView *ui, db::Manager *mgr, bool editable, lay::Plugin *plugin_parent, unsigned int options = (unsigned int) LV_Normal);
#else
LayoutViewBase (lay::LayoutView *ui, db::Manager *mgr, bool editable, lay::Plugin *plugin_parent, unsigned int options = (unsigned int) LV_Normal);
#endif
@@ -2667,9 +2670,6 @@ private:
void signal_apply_technology (lay::LayoutHandle *layout_handle);
private:
#if defined(HAVE_QT)
QWidget *mp_widget;
#endif
lay::LayoutView *mp_ui;
bool m_editable;
int m_disabled_edits;