[haiku-commits] haiku: hrev47605 - in src: servers/notification apps/showimage
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 30 Jul 2014 22:19:44 +0200 (CEST)
hrev47605 adds 2 changesets to branch 'master'
old head: 98f35f3a9239034b6e8e7a3fdf0ddce4efab39d3
new head: 2a740449bb933a8d9939b80472f70da655bd8688
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=2a74044+%5E98f35f3
----------------------------------------------------------------------------
358a4dd: ShowImage definitely knows Icon-O-Matic documents
And it's much easier to browse through data/artwork/icons!
2a74044: Use proper width for notification text
Fixes #10109.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 10 insertions(+), 6 deletions(-)
src/apps/showimage/ShowImage.rdef | 3 ++-
src/servers/notification/NotificationView.cpp | 13 ++++++++-----
############################################################################
Commit: 358a4dd379b4a5534a089322a88dc741bc348ef2
URL: http://cgit.haiku-os.org/haiku/commit/?id=358a4dd
Author: François Revol <revol@xxxxxxx>
Date: Wed Jul 30 18:41:27 2014 UTC
ShowImage definitely knows Icon-O-Matic documents
And it's much easier to browse through data/artwork/icons!
----------------------------------------------------------------------------
diff --git a/src/apps/showimage/ShowImage.rdef
b/src/apps/showimage/ShowImage.rdef
index f746423..d5de9af 100644
--- a/src/apps/showimage/ShowImage.rdef
+++ b/src/apps/showimage/ShowImage.rdef
@@ -18,7 +18,8 @@ resource app_version {
resource app_flags B_SINGLE_LAUNCH;
resource file_types message {
- "types" = "image"
+ "types" = "image",
+ "types" = "application/x-vnd.haiku-icon"
};
resource vector_icon {
############################################################################
Revision: hrev47605
Commit: 2a740449bb933a8d9939b80472f70da655bd8688
URL: http://cgit.haiku-os.org/haiku/commit/?id=2a74044
Author: François Revol <revol@xxxxxxx>
Date: Wed Jul 30 20:14:35 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/10109
Use proper width for notification text
Fixes #10109.
----------------------------------------------------------------------------
diff --git a/src/servers/notification/NotificationView.cpp
b/src/servers/notification/NotificationView.cpp
index 40704b9..8568e99 100644
--- a/src/servers/notification/NotificationView.cpp
+++ b/src/servers/notification/NotificationView.cpp
@@ -29,6 +29,8 @@
#include <Roster.h>
#include <StatusBar.h>
+#include <Notifications.h>
+
#include "AppGroupView.h"
#include "NotificationWindow.h"
@@ -101,8 +103,6 @@ NotificationView::NotificationView(NotificationWindow* win,
B_DARKEN_1_TINT);
break;
}
-
- SetText();
}
@@ -121,6 +121,8 @@ NotificationView::~NotificationView()
void
NotificationView::AttachedToWindow()
{
+ SetText();
+
BMessage msg(kRemoveView);
msg.AddPointer("view", this);
@@ -431,9 +433,10 @@ NotificationView::GetSupportedSuites(BMessage* msg)
void
NotificationView::SetText(float newMaxWidth)
{
- if (newMaxWidth < 0) {
- newMaxWidth = 200;
- }
+ if (newMaxWidth < 0 && Parent())
+ newMaxWidth = Parent()->Bounds().IntegerWidth();
+ if (newMaxWidth <= 0)
+ newMaxWidth = kDefaultWidth;
// Delete old lines
LineInfoList::iterator lIt;
Other related posts:
- » [haiku-commits] haiku: hrev47605 - in src: servers/notification apps/showimage - revol
