summary refs log tree commit diff
path: root/src/ChatPage.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2019-07-26 17:44:44 -0400
committerJoseph Donofry <joedonofry@gmail.com>2019-07-26 17:44:44 -0400
commit86888ee71349cb416e79940e3b369e047cf7492a (patch)
treee9c933a706b4268458b655b349b52bf6df002c89 /src/ChatPage.cpp
parentAdd emoji text selection option for non-mac (diff)
downloadnheko-86888ee71349cb416e79940e3b369e047cf7492a.tar.xz
Fix bug with emoji font setting and clean linting
Diffstat (limited to 'src/ChatPage.cpp')
-rw-r--r--src/ChatPage.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index deefec14..18188429 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -90,13 +90,13 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
         connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom);
         connect(sidebarActions_, &SideBarActions::createRoom, this, &ChatPage::createRoom);
 
-        user_info_widget_     = new UserInfoWidget(sideBar_);
-        //user_mentions_widget_ = new UserMentionsWidget(sideBar_);
-        room_list_            = new RoomList(sideBar_);
+        user_info_widget_ = new UserInfoWidget(sideBar_);
+        // user_mentions_widget_ = new UserMentionsWidget(sideBar_);
+        room_list_ = new RoomList(sideBar_);
         connect(room_list_, &RoomList::joinRoom, this, &ChatPage::joinRoom);
 
         sideBarLayout_->addWidget(user_info_widget_);
-        //sideBarLayout_->addWidget(user_mentions_widget_);
+        // sideBarLayout_->addWidget(user_mentions_widget_);
         sideBarLayout_->addWidget(room_list_);
         sideBarLayout_->addWidget(sidebarActions_);
 
@@ -159,7 +159,8 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                   1000,
                   "",
                   "highlight",
-                  [this, mentionsPos](const mtx::responses::Notifications &res, mtx::http::RequestErr err) {
+                  [this, mentionsPos](const mtx::responses::Notifications &res,
+                                      mtx::http::RequestErr err) {
                           if (err) {
                                   nhlog::net()->warn("failed to retrieve notifications: {} ({})",
                                                      err->matrix_error.error,
@@ -218,8 +219,6 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
                 }
         });
 
-
-
         connect(room_list_, &RoomList::roomChanged, this, [this](const QString &roomid) {
                 QStringList users;
 
@@ -1007,10 +1006,11 @@ ChatPage::showNotificationsDialog(const mtx::responses::Notifications &res, cons
                         nhlog::db()->warn("error while sending desktop notification: {}", e.what());
                 }
         }
-        notifDialog->setGeometry(widgetPos.x() - (width() / 10), widgetPos.y() + 25, width() / 5, height() / 2); 
-        //notifDialog->move(widgetPos.x(), widgetPos.y());
-        //notifDialog->setFixedWidth(width() / 10);
-        //notifDialog->setFixedHeight(height() / 2);
+        notifDialog->setGeometry(
+          widgetPos.x() - (width() / 10), widgetPos.y() + 25, width() / 5, height() / 2);
+        // notifDialog->move(widgetPos.x(), widgetPos.y());
+        // notifDialog->setFixedWidth(width() / 10);
+        // notifDialog->setFixedHeight(height() / 2);
         notifDialog->raise();
         notifDialog->show();
 }