Commit ea8eddc5 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Fixed bug in multiview with exchangeable widgets by moving the...

QT: Fixed bug in multiview with exchangeable widgets by moving the initialization to the beginning of the constructor.
parent d187e4e6
...@@ -176,6 +176,11 @@ XttMultiViewQt::XttMultiViewQt(void* mv_parent_ctx, const char* mv_name, ...@@ -176,6 +176,11 @@ XttMultiViewQt::XttMultiViewQt(void* mv_parent_ctx, const char* mv_name,
comp_widget = std::vector<QWidget*>(rows * cols); comp_widget = std::vector<QWidget*>(rows * cols);
exchange_widget = std::vector<QWidget*>(rows * cols); exchange_widget = std::vector<QWidget*>(rows * cols);
exchange_widget_layout = std::vector<QHBoxLayout*>(rows * cols); exchange_widget_layout = std::vector<QHBoxLayout*>(rows * cols);
for (int i = 0; i < rows * cols; i++) {
exchange_widget_layout[i] = new QHBoxLayout(toplevel);
exchange_widget[i]
= layout_to_widget(exchange_widget_layout[i]);
}
QHBoxLayout* col_widget_box = new QHBoxLayout(); QHBoxLayout* col_widget_box = new QHBoxLayout();
QSplitter* col_widget_pane = new QSplitter(); QSplitter* col_widget_pane = new QSplitter();
...@@ -680,8 +685,6 @@ XttMultiViewQt::XttMultiViewQt(void* mv_parent_ctx, const char* mv_name, ...@@ -680,8 +685,6 @@ XttMultiViewQt::XttMultiViewQt(void* mv_parent_ctx, const char* mv_name,
if (mv.Action[idx].Options if (mv.Action[idx].Options
& pwr_mMultiViewElemOptionsMask_Exchangeable) { & pwr_mMultiViewElemOptionsMask_Exchangeable) {
exchange_widget[idx]
= layout_to_widget(exchange_widget_layout[idx]);
if (comp_widget[idx]) { if (comp_widget[idx]) {
add_expanding(exchange_widget_layout[idx], add_expanding(exchange_widget_layout[idx],
comp_widget[idx]); comp_widget[idx]);
...@@ -1296,4 +1299,4 @@ void XttMultiViewQt::signal_send(char* signalname) ...@@ -1296,4 +1299,4 @@ void XttMultiViewQt::signal_send(char* signalname)
((XttMultiViewQt*) views[i].data)->signal_send(signalname); ((XttMultiViewQt*) views[i].data)->signal_send(signalname);
} }
} }
} }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment