StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

style(ipc, widgets, genericcharitemlayout): Small style changes

Browse Source
This commit is contained in:
Polshakov Dmitry 2016-04-19 15:06:06 +03:00 committed by Diadlo
parent 27faec918a
commit 2143e21e89
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ipc.cpp
View File

@ -281,7 +281,9 @@ void IPC::processEvents()
evt->processed = time(0); evt->processed = time(0);
} }
else else
{
evt->processed = time(0); evt->processed = time(0);
}
} }
} }
@ -293,5 +295,5 @@ void IPC::processEvents()
IPC::IPCMemory *IPC::global() IPC::IPCMemory *IPC::global()
{ {
return (IPCMemory*)globalMemory.data(); return static_cast<IPCMemory*>(globalMemory.data());
} }

29
src/widget/categorywidget.cpp
View File

@ -28,7 +28,7 @@
#include <QApplication> #include <QApplication>
void emitChatroomWidget(QLayout* layout, int index) void CategoryWidget::emitChatroomWidget(QLayout* layout, int index)
{ {
GenericChatroomWidget* chatWidget = dynamic_cast<GenericChatroomWidget*>(layout->itemAt(index)->widget()); GenericChatroomWidget* chatWidget = dynamic_cast<GenericChatroomWidget*>(layout->itemAt(index)->widget());
if (chatWidget != nullptr) if (chatWidget != nullptr)
@ -83,11 +83,12 @@ void CategoryWidget::setExpanded(bool isExpanded, bool save)
setMouseTracking(true); setMouseTracking(true);
listWidget->setVisible(isExpanded); listWidget->setVisible(isExpanded);
QString pixmapPath;
if (isExpanded) if (isExpanded)
statusPic.setPixmap(QPixmap(":/ui/chatArea/scrollBarDownArrow.svg")); pixmapPath = ":/ui/chatArea/scrollBarDownArrow.svg";
else else
statusPic.setPixmap(QPixmap(":/ui/chatArea/scrollBarRightArrow.svg")); pixmapPath = ":/ui/chatArea/scrollBarRightArrow.svg";
statusPic.setPixmap(QPixmap(pixmapPath));
// The listWidget will recieve a enterEvent for some reason if now visible. // The listWidget will recieve a enterEvent for some reason if now visible.
// Using the following, we prevent that. // Using the following, we prevent that.
QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers); QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers);
@ -199,19 +200,17 @@ bool CategoryWidget::cycleContacts(FriendWidget* activeChatroomWidget, bool forw
QLayout* currentLayout = nullptr; QLayout* currentLayout = nullptr;
FriendWidget* friendWidget = dynamic_cast<FriendWidget*>(activeChatroomWidget); FriendWidget* friendWidget = dynamic_cast<FriendWidget*>(activeChatroomWidget);
if (friendWidget != nullptr) if (friendWidget == nullptr)
{
currentLayout = listLayout->getLayoutOnline();
index = listLayout->indexOfFriendWidget(friendWidget, true);
if (index == -1)
{
currentLayout = listLayout->getLayoutOffline();
index = listLayout->indexOfFriendWidget(friendWidget, false);
}
}
else
return false; return false;
currentLayout = listLayout->getLayoutOnline();
index = listLayout->indexOfFriendWidget(friendWidget, true);
if (index == -1)
{
currentLayout = listLayout->getLayoutOffline();
index = listLayout->indexOfFriendWidget(friendWidget, false);
}
index += forward ? 1 : -1; index += forward ? 1 : -1;
for (;;) for (;;)
{ {

1
src/widget/categorywidget.h
View File

@ -60,6 +60,7 @@ protected:
QLayout* friendOnlineLayout() const; QLayout* friendOnlineLayout() const;
QLayout* friendOfflineLayout() const; QLayout* friendOfflineLayout() const;
void moveFriendWidgets(FriendListWidget* friendList); void moveFriendWidgets(FriendListWidget* friendList);
void emitChatroomWidget(QLayout *layout, int index);
private: private:
virtual void onSetName() {} virtual void onSetName() {}

4
src/widget/genericchatitemlayout.cpp
View File

@ -99,10 +99,10 @@ QLayout* GenericChatItemLayout::getLayout() const
int GenericChatItemLayout::indexOfClosestSortedWidget(GenericChatItemWidget* widget) const int GenericChatItemLayout::indexOfClosestSortedWidget(GenericChatItemWidget* widget) const
{ {
// Binary search: Deferred test of equality. // Binary search: Deferred test of equality.
int min = 0, max = layout->count(), mid; int min = 0, max = layout->count();
while (min < max) while (min < max)
{ {
mid = (max - min) / 2 + min; int mid = (max - min) / 2 + min;
GenericChatItemWidget* atMid = dynamic_cast<GenericChatItemWidget*>(layout->itemAt(mid)->widget()); GenericChatItemWidget* atMid = dynamic_cast<GenericChatItemWidget*>(layout->itemAt(mid)->widget());
assert(atMid != nullptr); assert(atMid != nullptr);

7
src/widget/genericchatroomwidget.cpp
View File

@ -29,10 +29,13 @@ GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
: GenericChatItemWidget(parent), active{false} : GenericChatItemWidget(parent), active{false}
{ {
// avatar // avatar
QSize size;
if (isCompact()) if (isCompact())
avatar = new MaskablePixmapWidget(this, QSize(20,20), ":/img/avatar_mask.svg"); size = QSize(20,20);
else else
avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.svg"); size = QSize(40,40);
avatar = new MaskablePixmapWidget(this, size, ":/img/avatar_mask.svg");
// status text // status text
statusMessageLabel = new CroppingLabel(this); statusMessageLabel = new CroppingLabel(this);