[haiku-commits] haiku: hrev44579 - in src: kits/interface add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 24 Aug 2012 05:45:30 +0200 (CEST)
hrev44579 adds 2 changesets to branch 'master'
old head: 0d7b06c3183d22f50e370e2165f7e337a20e5c59
new head: 8e80f8cc356e9737689c7f24a04ec2eb9bd8b79a
----------------------------------------------------------------------------
0457e30: Add another working card id.
8e80f8c: Fix MinSize and PreferredSize.
[ czeidler <haiku@xxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 5 insertions(+), 3 deletions(-)
.../network/wlan/iprowifi4965/dev/iwn/if_iwn.c | 1 +
src/kits/interface/StatusBar.cpp | 7 ++++---
############################################################################
Commit: 0457e3073e2975a53b971455e662b7bc47074fb4
URL: http://cgit.haiku-os.org/haiku/commit/?id=0457e30
Author: czeidler <haiku@xxxxxxxxxxxxxxxxxx>
Date: Fri Aug 24 03:42:47 2012 UTC
Add another working card id.
----------------------------------------------------------------------------
diff --git
a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
index 30f852d..6c95ec0 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
@@ -89,6 +89,7 @@ static const struct iwn_ident iwn_ident_table[] = {
{ 0x8086, 0x008b, "Intel(R) Centrino(R) Wireless-N 1030" },
{ 0x8086, 0x0090, "Intel(R) Centrino(R) Advanced-N 6230" },
{ 0x8086, 0x0091, "Intel(R) Centrino(R) Advanced-N 6230" },
+ { 0x8086, 0x088e, "Intel(R) Centrino(R) Advanced-N 6235" },
{ 0x8086, 0x0896, "Intel(R) Centrino(R) Wireless-N 130" },
{ 0x8086, 0x4229, "Intel(R) Wireless WiFi Link 4965" },
{ 0x8086, 0x422b, "Intel(R) Centrino(R) Ultimate-N 6300" },
############################################################################
Revision: hrev44579
Commit: 8e80f8cc356e9737689c7f24a04ec2eb9bd8b79a
URL: http://cgit.haiku-os.org/haiku/commit/?id=8e80f8c
Author: czeidler <haiku@xxxxxxxxxxxxxxxxxx>
Date: Fri Aug 24 03:44:13 2012 UTC
Fix MinSize and PreferredSize.
----------------------------------------------------------------------------
diff --git a/src/kits/interface/StatusBar.cpp b/src/kits/interface/StatusBar.cpp
index d346f11..7cd4f74 100644
--- a/src/kits/interface/StatusBar.cpp
+++ b/src/kits/interface/StatusBar.cpp
@@ -225,7 +225,7 @@ BStatusBar::MinSize()
float width, height;
GetPreferredSize(&width, &height);
- return BLayoutUtils::ComposeSize(ExplicitMaxSize(), BSize(width,
height));
+ return BLayoutUtils::ComposeSize(ExplicitMinSize(), BSize(width,
height));
}
@@ -236,7 +236,7 @@ BStatusBar::MaxSize()
GetPreferredSize(&width, &height);
return BLayoutUtils::ComposeSize(ExplicitMaxSize(),
- BSize(B_SIZE_UNLIMITED, height));
+ BSize(B_SIZE_UNLIMITED, height));
}
@@ -246,7 +246,8 @@ BStatusBar::PreferredSize()
float width, height;
GetPreferredSize(&width, &height);
- return BLayoutUtils::ComposeSize(ExplicitMaxSize(), BSize(width,
height));
+ return BLayoutUtils::ComposeSize(ExplicitPreferredSize(),
+ BSize(width, height));
}
Other related posts:
- » [haiku-commits] haiku: hrev44579 - in src: kits/interface add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn - clemens . zeidler
