retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Added more window flags to set from ui. Don't move notification windows. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@5555 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2013-06-25 15:01:05 +00:00
parent 5be733d70a
commit 8cec1717df
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
clients/qt4/qt4client.cpp
View File

@ -405,6 +405,16 @@ ObjList UIBuffer::s_uiCache;
// Values used to configure window title bar and border // Values used to configure window title bar and border
static TokenDict s_windowFlags[] = { static TokenDict s_windowFlags[] = {
// Window type
{"popup", Qt::Popup},
{"tool", Qt::Tool},
{"subwindow", Qt::SubWindow},
#ifdef _WINDOWS
{"notificationtype", Qt::Tool},
#else
{"notificationtype", Qt::SubWindow},
#endif
// Window flags
{"title", Qt::WindowTitleHint}, {"title", Qt::WindowTitleHint},
{"sysmenu", Qt::WindowSystemMenuHint}, {"sysmenu", Qt::WindowSystemMenuHint},
{"maximize", Qt::WindowMaximizeButtonHint}, {"maximize", Qt::WindowMaximizeButtonHint},
@ -957,7 +967,7 @@ UIBuffer* UIBuffer::find(const String& name)
*/ */
QtWindow::QtWindow() QtWindow::QtWindow()
: m_x(0), m_y(0), m_width(0), m_height(0), : m_x(0), m_y(0), m_width(0), m_height(0),
m_maximized(false), m_mainWindow(false), m_moving(false) m_maximized(false), m_mainWindow(false), m_moving(0)
{ {
} }
@ -965,7 +975,7 @@ QtWindow::QtWindow(const char* name, const char* description, const char* alias,
: QWidget(parent, Qt::Window), : QWidget(parent, Qt::Window),
Window(alias ? alias : name), m_description(description), m_oldId(name), Window(alias ? alias : name), m_description(description), m_oldId(name),
m_x(0), m_y(0), m_width(0), m_height(0), m_x(0), m_y(0), m_width(0), m_height(0),
m_maximized(false), m_mainWindow(false), m_moving(false) m_maximized(false), m_mainWindow(false), m_moving(0)
{ {
setObjectName(QtClient::setUtf8(m_id)); setObjectName(QtClient::setUtf8(m_id));
} }
@ -2672,6 +2682,9 @@ void QtWindow::setVisible(bool visible)
// Override position for notification windows // Override position for notification windows
if (visible && isShownNormal() && if (visible && isShownNormal() &&
QtClient::getBoolProperty(wndWidget(),"_yate_notificationwindow")) { QtClient::getBoolProperty(wndWidget(),"_yate_notificationwindow")) {
// Don't move
m_moving = -1;
#ifndef Q_WS_MAC
// Detect unavailable screen space position and move the window in the apropriate position // Detect unavailable screen space position and move the window in the apropriate position
// bottom/right/none: move it in the right/bottom corner. // bottom/right/none: move it in the right/bottom corner.
// top: move it in the right/top corner. // top: move it in the right/top corner.
@ -2685,6 +2698,9 @@ void QtWindow::setVisible(bool visible)
else else
QtClient::moveWindow(this,QtClient::CornerBottomLeft); QtClient::moveWindow(this,QtClient::CornerBottomLeft);
} }
#else
QtClient::moveWindow(this,QtClient::CornerTopRight);
#endif
} }
if (visible && isMinimized()) if (visible && isMinimized())
showNormal(); showNormal();
@ -3209,23 +3225,23 @@ void QtWindow::doInit()
// Mouse button pressed notification // Mouse button pressed notification
void QtWindow::mousePressEvent(QMouseEvent* event) void QtWindow::mousePressEvent(QMouseEvent* event)
{ {
if (Qt::LeftButton == event->button() && isShownNormal()) { if (m_moving >= 0 && Qt::LeftButton == event->button() && isShownNormal()) {
m_movePos = event->globalPos(); m_movePos = event->globalPos();
m_moving = true; m_moving = 1;
} }
} }
// Mouse button release notification // Mouse button release notification
void QtWindow::mouseReleaseEvent(QMouseEvent* event) void QtWindow::mouseReleaseEvent(QMouseEvent* event)
{ {
if (Qt::LeftButton == event->button()) if (m_moving >= 0 && Qt::LeftButton == event->button())
m_moving = false; m_moving = 0;
} }
// Move the window if the moving flag is set // Move the window if the moving flag is set
void QtWindow::mouseMoveEvent(QMouseEvent* event) void QtWindow::mouseMoveEvent(QMouseEvent* event)
{ {
if (!m_moving || Qt::LeftButton != event->buttons() || !isShownNormal()) if (m_moving <= 0 || Qt::LeftButton != event->buttons() || !isShownNormal())
return; return;
int cx = event->globalPos().x() - m_movePos.x(); int cx = event->globalPos().x() - m_movePos.x();
int cy = event->globalPos().y() - m_movePos.y(); int cy = event->globalPos().y() - m_movePos.y();

2
clients/qt4/qt4client.h
View File

@ -1100,7 +1100,7 @@ protected:
bool m_maximized; bool m_maximized;
bool m_mainWindow; // Main window flag: close app when this window is closed bool m_mainWindow; // Main window flag: close app when this window is closed
QString m_widget; // The widget with window's content QString m_widget; // The widget with window's content
bool m_moving; // Flag used to move the window on mouse move event int m_moving; // Flag used to move the window on mouse move event
QPoint m_movePos; // Old position used when moving the window QPoint m_movePos; // Old position used when moving the window
}; };