[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] Change in haiku[master]: IK: Propagate B_WORKSPACE_ACTIVATED to child views
From: Gerrit <review () review ! haiku-os ! org>
Date: 2022-07-31 4:18:16
Message-ID: b80bb1d56408dcabeffbf515380c182b9d97019e-HTML () review ! haiku-os ! org
[Download RAW message or body]
From John Scipione <jscipione@gmail.com>:
John Scipione has uploaded this change for review. ( https://review.haiku-os.org/c/haiku/+/5516 )
Change subject: IK: Propagate B_WORKSPACE_ACTIVATED to child views
......................................................................
IK: Propagate B_WORKSPACE_ACTIVATED to child views
... and B_WORKSPACES_CHANGED too.
hrev50148 propagated B_SCREEN_CHANGED messages to
children allowing them to respond to screen changes
fixing #8035 back in 2016.
This does the same thing for workspace messages only
I spelled propagate correctly this time.
Change-Id: I5978c3fe674bbe75d9eafb7afb654a49ee3e0c11
---
M src/kits/interface/View.cpp
M src/kits/interface/Window.cpp
2 files changed, 26 insertions(+), 5 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/16/5516/1
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index 7671604..1d6d1cc 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -5122,8 +5122,10 @@
break;
case B_SCREEN_CHANGED:
+ case B_WORKSPACE_ACTIVATED:
+ case B_WORKSPACES_CHANGED:
{
- // propegate message to child views
+ // propagate message to child views
int32 childCount = CountChildren();
for (int32 i = 0; i < childCount; i++) {
BView* view = ChildAt(i);
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index a4c409f..b3de4d0 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -1113,7 +1113,7 @@
uint32 mode;
if (message->FindRect("frame", &frame) == B_OK
&& message->FindInt32("mode", (int32*)&mode) == B_OK) {
- // propegate message to child views
+ // propagate message to child views
int32 childCount = CountChildren();
for (int32 i = 0; i < childCount; i++) {
BView* view = ChildAt(i);
@@ -1132,18 +1132,37 @@
uint32 workspace;
bool active;
if (message->FindInt32("workspace", (int32*)&workspace) == B_OK
- && message->FindBool("active", &active) == B_OK)
+ && message->FindBool("active", &active) == B_OK) {
+ // propagate message to child views
+ int32 childCount = CountChildren();
+ for (int32 i = 0; i < childCount; i++) {
+ BView* view = ChildAt(i);
+ if (view != NULL)
+ view->MessageReceived(message);
+ }
+ // call hook method
WorkspaceActivated(workspace, active);
+ }
} else
target->MessageReceived(message);
break;
case B_WORKSPACES_CHANGED:
if (target == this) {
- uint32 oldWorkspace, newWorkspace;
+ uint32 oldWorkspace;
+ uint32 newWorkspace;
if (message->FindInt32("old", (int32*)&oldWorkspace) == B_OK
- && message->FindInt32("new", (int32*)&newWorkspace) == B_OK)
+ && message->FindInt32("new", (int32*)&newWorkspace) == B_OK) {
+ // propagate message to child views
+ int32 childCount = CountChildren();
+ for (int32 i = 0; i < childCount; i++) {
+ BView* view = ChildAt(i);
+ if (view != NULL)
+ view->MessageReceived(message);
+ }
+ // call hook method
WorkspacesChanged(oldWorkspace, newWorkspace);
+ }
} else
target->MessageReceived(message);
break;
--
To view, visit https://review.haiku-os.org/c/haiku/+/5516
To unsubscribe, or for help writing mail filters, visit https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I5978c3fe674bbe75d9eafb7afb654a49ee3e0c11
Gerrit-Change-Number: 5516
Gerrit-PatchSet: 1
Gerrit-Owner: John Scipione <jscipione@gmail.com>
Gerrit-MessageType: newchange
[Attachment #3 (text/html)]
<p>John Scipione has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/5516">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">IK: Propagate \
B_WORKSPACE_ACTIVATED to child views<br><br>... and B_WORKSPACES_CHANGED \
too.<br><br>hrev50148 propagated B_SCREEN_CHANGED messages to<br>children allowing \
them to respond to screen changes<br>fixing #8035 back in 2016.<br><br>This does the \
same thing for workspace messages only<br>I spelled propagate correctly this \
time.<br><br>Change-Id: I5978c3fe674bbe75d9eafb7afb654a49ee3e0c11<br>---<br>M \
src/kits/interface/View.cpp<br>M src/kits/interface/Window.cpp<br>2 files changed, 26 \
insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: \
monospace,monospace; white-space: pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku \
refs/changes/16/5516/1</pre><pre style="font-family: monospace,monospace; \
white-space: pre-wrap;"><span>diff --git a/src/kits/interface/View.cpp \
b/src/kits/interface/View.cpp</span><br><span>index 7671604..1d6d1cc \
100644</span><br><span>--- a/src/kits/interface/View.cpp</span><br><span>+++ \
b/src/kits/interface/View.cpp</span><br><span>@@ -5122,8 +5122,10 @@</span><br><span> \
break;</span><br><span> </span><br><span> case B_SCREEN_CHANGED:</span><br><span \
style="color: hsl(120, 100%, 40%);">+ case B_WORKSPACE_ACTIVATED:</span><br><span \
style="color: hsl(120, 100%, 40%);">+ case B_WORKSPACES_CHANGED:</span><br><span> \
{</span><br><span style="color: hsl(0, 100%, 40%);">- // propegate message to \
child views</span><br><span style="color: hsl(120, 100%, 40%);">+ // propagate \
message to child views</span><br><span> int32 childCount = \
CountChildren();</span><br><span> for (int32 i = 0; i < childCount; i++) \
{</span><br><span> BView* view = ChildAt(i);</span><br><span>diff --git \
a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp</span><br><span>index \
a4c409f..b3de4d0 100644</span><br><span>--- \
a/src/kits/interface/Window.cpp</span><br><span>+++ \
b/src/kits/interface/Window.cpp</span><br><span>@@ -1113,7 +1113,7 \
@@</span><br><span> uint32 mode;</span><br><span> if \
(message->FindRect("frame", &frame) == B_OK</span><br><span> \
&& message->FindInt32("mode", (int32*)&mode) == B_OK) \
{</span><br><span style="color: hsl(0, 100%, 40%);">- // propegate message to \
child views</span><br><span style="color: hsl(120, 100%, 40%);">+ // propagate \
message to child views</span><br><span> int32 childCount = \
CountChildren();</span><br><span> for (int32 i = 0; i < childCount; i++) \
{</span><br><span> BView* view = ChildAt(i);</span><br><span>@@ -1132,18 \
+1132,37 @@</span><br><span> uint32 workspace;</span><br><span> bool \
active;</span><br><span> if (message->FindInt32("workspace", \
(int32*)&workspace) == B_OK</span><br><span style="color: hsl(0, 100%, \
40%);">- && message->FindBool("active", &active) == \
B_OK)</span><br><span style="color: hsl(120, 100%, 40%);">+ && \
message->FindBool("active", &active) == B_OK) {</span><br><span \
style="color: hsl(120, 100%, 40%);">+ // propagate message to child \
views</span><br><span style="color: hsl(120, 100%, 40%);">+ int32 childCount = \
CountChildren();</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int32 \
i = 0; i < childCount; i++) {</span><br><span style="color: hsl(120, 100%, \
40%);">+ BView* view = ChildAt(i);</span><br><span style="color: hsl(120, 100%, \
40%);">+ if (view != NULL)</span><br><span style="color: hsl(120, 100%, \
40%);">+ view->MessageReceived(message);</span><br><span style="color: \
hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, \
40%);">+ // call hook method</span><br><span> WorkspaceActivated(workspace, \
active);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> \
} else</span><br><span> target->MessageReceived(message);</span><br><span> \
break;</span><br><span> </span><br><span> case \
B_WORKSPACES_CHANGED:</span><br><span> if (target == this) {</span><br><span \
style="color: hsl(0, 100%, 40%);">- uint32 oldWorkspace, \
newWorkspace;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32 \
oldWorkspace;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32 \
newWorkspace;</span><br><span> if (message->FindInt32("old", \
(int32*)&oldWorkspace) == B_OK</span><br><span style="color: hsl(0, 100%, \
40%);">- && message->FindInt32("new", \
(int32*)&newWorkspace) == B_OK)</span><br><span style="color: hsl(120, 100%, \
40%);">+ && message->FindInt32("new", \
(int32*)&newWorkspace) == B_OK) {</span><br><span style="color: hsl(120, 100%, \
40%);">+ // propagate message to child views</span><br><span style="color: \
hsl(120, 100%, 40%);">+ int32 childCount = CountChildren();</span><br><span \
style="color: hsl(120, 100%, 40%);">+ for (int32 i = 0; i < childCount; i++) \
{</span><br><span style="color: hsl(120, 100%, 40%);">+ BView* view = \
ChildAt(i);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (view != \
NULL)</span><br><span style="color: hsl(120, 100%, \
40%);">+ view->MessageReceived(message);</span><br><span style="color: \
hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, \
40%);">+ // call hook method</span><br><span> \
WorkspacesChanged(oldWorkspace, newWorkspace);</span><br><span style="color: hsl(120, \
100%, 40%);">+ }</span><br><span> } else</span><br><span> \
target->MessageReceived(message);</span><br><span> \
break;</span><br><span></span><br></pre><p>To view, visit <a \
href="https://review.haiku-os.org/c/haiku/+/5516">change 5516</a>. To unsubscribe, or \
for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="https://review.haiku-os.org/c/haiku/+/5516"/><meta itemprop="name" \
content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
I5978c3fe674bbe75d9eafb7afb654a49ee3e0c11 </div> <div style="display:none"> \
Gerrit-Change-Number: 5516 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: John Scipione \
<jscipione@gmail.com> </div> <div style="display:none"> Gerrit-MessageType: \
newchange </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic