- Library code update
- project update (added Eigen) git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@94 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
@@ -142,7 +142,6 @@ public:
|
||||
|
||||
if (currentPeer != peer)
|
||||
{
|
||||
removeFromParent();
|
||||
currentPeer = peer;
|
||||
|
||||
if (peer != nullptr)
|
||||
@@ -151,6 +150,10 @@ public:
|
||||
[peerView addSubview: view];
|
||||
componentMovedOrResized (false, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
removeFromParent();
|
||||
}
|
||||
}
|
||||
|
||||
[view setHidden: ! owner.isShowing()];
|
||||
|
||||
@@ -53,7 +53,10 @@ public:
|
||||
|
||||
~Pimpl()
|
||||
{
|
||||
[[NSNotificationCenter defaultCenter] removeObserver: view];
|
||||
[[NSStatusBar systemStatusBar] removeStatusItem: statusItem];
|
||||
SystemTrayViewClass::setOwner (view, nullptr);
|
||||
SystemTrayViewClass::setImage (view, nil);
|
||||
[statusItem release];
|
||||
[view release];
|
||||
[statusIcon release];
|
||||
@@ -99,21 +102,21 @@ public:
|
||||
|
||||
if (isLeft || isRight) // Only mouse up is sent by the OS, so simulate a down/up
|
||||
{
|
||||
owner.mouseDown (MouseEvent (mouseSource, Point<int>(),
|
||||
owner.mouseDown (MouseEvent (mouseSource, Point<float>(),
|
||||
eventMods.withFlags (isLeft ? ModifierKeys::leftButtonModifier
|
||||
: ModifierKeys::rightButtonModifier),
|
||||
&owner, &owner, now,
|
||||
Point<int>(), now, 1, false));
|
||||
Point<float>(), now, 1, false));
|
||||
|
||||
owner.mouseUp (MouseEvent (mouseSource, Point<int>(), eventMods.withoutMouseButtons(),
|
||||
owner.mouseUp (MouseEvent (mouseSource, Point<float>(), eventMods.withoutMouseButtons(),
|
||||
&owner, &owner, now,
|
||||
Point<int>(), now, 1, false));
|
||||
Point<float>(), now, 1, false));
|
||||
}
|
||||
else if (type == NSMouseMoved)
|
||||
{
|
||||
owner.mouseMove (MouseEvent (mouseSource, Point<int>(), eventMods,
|
||||
owner.mouseMove (MouseEvent (mouseSource, Point<float>(), eventMods,
|
||||
&owner, &owner, now,
|
||||
Point<int>(), now, 1, false));
|
||||
Point<float>(), now, 1, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,6 +70,7 @@ private:
|
||||
|
||||
static void runOpenPanel (id, SEL, WebView*, id<WebOpenPanelResultListener> resultListener, BOOL allowMultipleFiles)
|
||||
{
|
||||
#if JUCE_MODAL_LOOPS_PERMITTED
|
||||
FileChooser chooser (TRANS("Select the file you want to upload..."),
|
||||
File::getSpecialLocation (File::userHomeDirectory), "*");
|
||||
|
||||
@@ -81,6 +82,10 @@ private:
|
||||
for (int i = 0; i < files.size(); ++i)
|
||||
[resultListener chooseFilename: juceStringToNS (files.getReference(i).getFullPathName())];
|
||||
}
|
||||
#else
|
||||
(void) resultListener; (void) allowMultipleFiles;
|
||||
jassertfalse; // Can't use this without modal loops being enabled!
|
||||
#endif
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@ namespace ActiveXHelpers
|
||||
case WM_MBUTTONUP:
|
||||
case WM_RBUTTONUP:
|
||||
peer->handleMouseEvent (0, Point<int> (GET_X_LPARAM (lParam) + activeXRect.left - peerRect.left,
|
||||
GET_Y_LPARAM (lParam) + activeXRect.top - peerRect.top),
|
||||
GET_Y_LPARAM (lParam) + activeXRect.top - peerRect.top).toFloat(),
|
||||
ModifierKeys::getCurrentModifiersRealtime(),
|
||||
getMouseEventTime());
|
||||
break;
|
||||
|
||||
@@ -111,8 +111,8 @@ public:
|
||||
const Time eventTime (getMouseEventTime());
|
||||
|
||||
const MouseEvent e (Desktop::getInstance().getMainMouseSource(),
|
||||
Point<int>(), eventMods, &owner, &owner, eventTime,
|
||||
Point<int>(), eventTime, 1, false);
|
||||
Point<float>(), eventMods, &owner, &owner, eventTime,
|
||||
Point<float>(), eventTime, 1, false);
|
||||
|
||||
if (lParam == WM_LBUTTONDOWN || lParam == WM_RBUTTONDOWN)
|
||||
{
|
||||
|
||||
@@ -226,6 +226,9 @@ void WebBrowserComponent::goToURL (const String& url,
|
||||
|
||||
blankPageShown = false;
|
||||
|
||||
if (browser->browser == nullptr)
|
||||
checkWindowAssociation();
|
||||
|
||||
browser->goToURL (url, headers, postData);
|
||||
}
|
||||
|
||||
@@ -262,7 +265,10 @@ void WebBrowserComponent::refresh()
|
||||
void WebBrowserComponent::paint (Graphics& g)
|
||||
{
|
||||
if (browser->browser == nullptr)
|
||||
{
|
||||
g.fillAll (Colours::white);
|
||||
checkWindowAssociation();
|
||||
}
|
||||
}
|
||||
|
||||
void WebBrowserComponent::checkWindowAssociation()
|
||||
|
||||
Reference in New Issue
Block a user