hrev50794 adds 2 changesets to branch 'master'
old head: d249a6ae8564c8b2a5716a435bc103a2034a6e2f
new head: 4068f2821a9dc9280159177cf75862e3d49ff6e1
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=4068f2821a9d+%5Ed249a6ae8564
----------------------------------------------------------------------------
707717e8bec2: keystore_server: Use path as dummy checksum.
* Slighty better than nothing.
4068f2821a9d: MediaPlayer: Make sure the window is on screen.
* The existing check in _ResizeWindow() was avoided when there
is an initial frame to use (when launching with an audio file).
[ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 4 insertions(+), 1 deletion(-)
src/apps/mediaplayer/MainWin.cpp | 3 +++
src/servers/keystore/KeyStoreServer.cpp | 2 +-
############################################################################
Commit: 707717e8bec291f31bef0e5ccaa92de5badc6f54
URL: http://cgit.haiku-os.org/haiku/commit/?id=707717e8bec2
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Wed Dec 28 16:41:04 2016 UTC
keystore_server: Use path as dummy checksum.
* Slighty better than nothing.
----------------------------------------------------------------------------
diff --git a/src/servers/keystore/KeyStoreServer.cpp
b/src/servers/keystore/KeyStoreServer.cpp
index 1c7ca38..41b1732 100644
--- a/src/servers/keystore/KeyStoreServer.cpp
+++ b/src/servers/keystore/KeyStoreServer.cpp
@@ -648,7 +648,7 @@ KeyStoreServer::_ValidateAppAccess(Keyring& keyring, const
app_info& appInfo,
return result;
// TODO: Implement running image checksum mechanism.
- BString checksum = "dummy";
+ BString checksum = path.Path();
bool appIsNew = false;
bool appWasUpdated = false;
############################################################################
Revision: hrev50794
Commit: 4068f2821a9dc9280159177cf75862e3d49ff6e1
URL: http://cgit.haiku-os.org/haiku/commit/?id=4068f2821a9d
Author: Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date: Wed Dec 28 16:43:19 2016 UTC
MediaPlayer: Make sure the window is on screen.
* The existing check in _ResizeWindow() was avoided when there
is an initial frame to use (when launching with an audio file).
----------------------------------------------------------------------------
diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp
index 4672728..c8efaea 100644
--- a/src/apps/mediaplayer/MainWin.cpp
+++ b/src/apps/mediaplayer/MainWin.cpp
@@ -1872,6 +1872,8 @@ MainWin::_ResizeWindow(int percent, bool useNoVideoWidth,
bool stayOnScreen)
if (!screenFrame.Contains(frame)) {
// Resize the window so it doesn't extend outside the
current
// screen frame.
+ // We don't use BWindow::MoveOnScreen() in order to
resize the
+ // window while keeping the same aspect ratio.
if (frame.Width() > screenFrame.Width()
|| frame.Height() > screenFrame.Height()) {
// too large
@@ -2396,6 +2398,7 @@ MainWin::_ShowIfNeeded()
if (!fHasVideo && fNoVideoFrame.IsValid()) {
MoveTo(fNoVideoFrame.LeftTop());
ResizeTo(fNoVideoFrame.Width(), fNoVideoFrame.Height());
+ MoveOnScreen(B_MOVE_IF_PARTIALLY_OFFSCREEN);
} else if (fHasVideo && IsHidden())
CenterOnScreen();
