Commit a9f7bd32 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: xtt_ge widget can made smaller than initial size.

parent 845ab2c9
...@@ -367,6 +367,8 @@ XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name, ...@@ -367,6 +367,8 @@ XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name,
graph->sound_cb = &ge_sound_cb; graph->sound_cb = &ge_sound_cb;
graph->eventlog_cb = &ge_eventlog_cb; graph->eventlog_cb = &ge_eventlog_cb;
grow_widget->setMinimumSize(window_width, window_height);
QObject::connect(((GraphQt*)graph)->grow_widget, QObject::connect(((GraphQt*)graph)->grow_widget,
SIGNAL(resize_signal(QResizeEvent*)), toplevel, SIGNAL(resize_signal(QResizeEvent*)), toplevel,
SLOT(action_resize(QResizeEvent*))); SLOT(action_resize(QResizeEvent*)));
...@@ -435,7 +437,7 @@ XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name, ...@@ -435,7 +437,7 @@ XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name,
toplevel->setVisible(false); toplevel->setVisible(false);
} }
} else { } else {
this->graph_form->setMinimumSize(window_width, window_height); this->graph_form->resize(window_width, window_height);
} }
if (borders) { if (borders) {
...@@ -456,7 +458,7 @@ XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name, ...@@ -456,7 +458,7 @@ XttGeQt::XttGeQt(void* xg_parent_ctx, const char* xg_name,
min_aspect = double(window_width) / window_height * (1.0 - rd); min_aspect = double(window_width) / window_height * (1.0 - rd);
max_aspect = double(window_width) / window_height * (1.0 + rd); max_aspect = double(window_width) / window_height * (1.0 + rd);
toplevel->setMinimumSize(window_width, window_height); toplevel->resize(window_width, window_height);
} }
void XttGeQt::create_confirm_dialog() void XttGeQt::create_confirm_dialog()
......
...@@ -243,21 +243,13 @@ void XttMethodToolbarQt::set_current_sensitive() ...@@ -243,21 +243,13 @@ void XttMethodToolbarQt::set_current_sensitive()
for (int i = 0; i < GeMethods::opmeth_size; i++) { for (int i = 0; i < GeMethods::opmeth_size; i++) {
if (m_op_method_mask & (1 << i) if (m_op_method_mask & (1 << i)
&& !streq(GeMethods::op_image[i], "")) { && !streq(GeMethods::op_image[i], "")) {
if (xm_mask.OpMethods & (1 << i)) { m_op_button_w[i]->setEnabled(xm_mask.OpMethods & (1 << i));
m_op_button_w[i]->setEnabled(true);
} else {
m_op_button_w[i]->setEnabled(false);
}
} }
} }
for (int i = 0; i < GeMethods::mntmeth_size; i++) { for (int i = 0; i < GeMethods::mntmeth_size; i++) {
if (m_mnt_method_mask & (1 << i) if (m_mnt_method_mask & (1 << i)
&& !streq(GeMethods::mnt_image[i], "")) { && !streq(GeMethods::mnt_image[i], "")) {
if (xm_mask.MntMethods & (1 << i)) { m_mnt_button_w[i]->setEnabled(xm_mask.MntMethods & (1 << i));
m_mnt_button_w[i]->setEnabled(true);
} else {
m_mnt_button_w[i]->setEnabled(false);
}
} }
} }
if (mask_store) { if (mask_store) {
...@@ -268,4 +260,4 @@ void XttMethodToolbarQt::set_current_sensitive() ...@@ -268,4 +260,4 @@ void XttMethodToolbarQt::set_current_sensitive()
} }
} }
} }
} }
\ 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